diff --git a/.gitignore b/.gitignore index f16baa8..a93c4b5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ .project .classpath +gc_spider/cookie.txt +php/campus/cocal.db diff --git a/README.md b/README.md new file mode 100644 index 0000000..4e7bdc3 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +snippets +======== + +Meine Werkzeugssammlung + +I'm using this repository to gather various scripts and utities I'm using all day. +It's growing continously and hopefully other can profit for it. + +Everything ins this repo is licenced under GPLv3. diff --git a/bash/backup-btrfs.sh b/bash/backup-btrfs.sh new file mode 100644 index 0000000..48fc98a --- /dev/null +++ b/bash/backup-btrfs.sh @@ -0,0 +1,93 @@ +#!/bin/bash +## + # Incremental backups with Btrfs snapshots + # + # This script does incremental backups of Btrfs subvolumes + # across filesystem boundaries as proposed in the Btrfs wiki: + # https://btrfs.wiki.kernel.org/index.php/Incremental_Backup + # + # It uses the 'btrfs send' and 'btrfs receive' commands. + # Its not intended for simple snapshots in a single filesystem enviroment. + # + # @copyright 2013 Steffen Vogel + # @license http://www.gnu.org/licenses/gpl.txt GNU Public License + # @author Steffen Vogel + # @link http://www.steffenvogel.de + ## +## + # This script is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # any later version. + # + # This script is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this script. If not, see . + ## + +# TODO: delete old snapshots in destination fs +# TODO: print statistics of send | receive pipe (speed & size) + +function usage { + echo "Usage: $(basename $0) SOURCE [DEST]" + echo + echo " SOURCE a path to the subvolume to backup" + echo " DEST an optional path to the backup destination" + echo " only required for initialization" + exit 1 +} + +set -e + +if [ $# -lt 1 ]; then + echo -e "missing source" + echo + usage +fi + +SRC=$(readlink -f "$1") + +if [ -h "$SRC/.backup/destination" ]; then + DEST=$(readlink -f "$SRC/.backup/destination") +elif [ $# -ne 2 ] ; then + echo -e "missing destination" + echo + usage +else + DEST=$(readlink -f $2) + + mkdir -p "$SRC/.backup/" + mkdir -p "$DEST" + + ln -sf "$DEST" "$SRC/.backup/destination" + ln -sf "$SRC" "$DEST/source" +fi + +# name for the new snapshot +SNAPSHOT=$(date +%F_%H-%M-%S) +LATEST="$SRC/.backup/$SNAPSHOT" + +# snapshot the current state +btrfs subvolume snapshot -r "$SRC" "$LATEST" + +# send changes +if [ -h "$DEST/latest-source" ]; then + PREVIOUS=$(readlink -f "$DEST/latest-source") + btrfs send -p "$PREVIOUS" "$LATEST" | btrfs receive "$DEST" +else + btrfs send "$LATEST" | btrfs receive "$DEST" +fi + +# delete old snapshot in source fs +if [ -n "$PREVIOUS" ]; then + btrfs subvolume delete "$PREVIOUS" +fi + +# update links to last backup +ln -rsfT "$DEST/$SNAPSHOT" "$DEST/latest" +ln -sfT "$LATEST" "$DEST/latest-source" + diff --git a/bash/backup-mysql.sh b/bash/backup-mysql.sh new file mode 100644 index 0000000..53f9f6c --- /dev/null +++ b/bash/backup-mysql.sh @@ -0,0 +1,112 @@ +#!/bin/bash +## + # Backup mySQL databases in separate sql dumps + # + # @copyright 2013 Steffen Vogel + # @license http://www.gnu.org/licenses/gpl.txt GNU Public License + # @author Steffen Vogel + # @link http://www.steffenvogel.de + ## +## + # This script is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # any later version. + # + # This script is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this script. If not, see . + ## + +set -e + +function usage { + cat <<-EOF + Usage: $(basename $0) [-u USER] [-p PASSWORD] DIR + + DIR is the directory for the backups (defaults to cwd) + + Options: + -u mysql username + -p mysql password + -h show this help + -d enable verbose output + + written by Steffen Vogel + EOF +} + +function deps() { + FAILED=0 + for DEP in $*; do + if ! which ${DEP} &>/dev/null; then + echo -e "This script requires ${DEP} to run but it is not installed." + ((FAILED++)) + fi + done + return ${FAILED} +} + +if ! deps mysql mysqldump; then + echo -e "mysql tools missing!" + echo + usage + exit 1 +fi + +# parse arguments +while getopts "u:p:hd" OPT; do + case ${OPT} in + p) MYSQL_PASS=${OPTARG} ;; + u) MYSQL_USER=${OPTARG} ;; + d) V=1 ;; + h) + usage + exit 0 ;; + *) + usage + exit 1 + esac +done + +# clear all options and reset the command line +shift $((OPTIND-1)) + +# parsing backup directory +if [ -n "$1" ]; then + DIR=$(readlink -f $1) +else + DIR=$(pwd) +fi + +# mySQL options +OPTS="" +if [ -n "$MYSQL_USER" ]; then + OPTS+=" -u$MYSQL_USER" +fi + +if [ -n "$MYSQL_PASS" ]; then + OPTS+=" -p$MYSQL_PASS" +fi + +# get all databases +DATABASES=`mysql $OPTS -e "SHOW DATABASES;" | grep -Ev "(Database|information_schema|performance_schema)"` +DATE=$(date +%F_%H-%M-%S) + +mkdir -p $DIR/$DATE +ln -rsfT $DIR/$DATE/ $DIR/latest + +[ -z "$V" ] || echo "Starting mySQL backup: $(date)" +[ -z "$V" ] || echo "$(echo '$DATABASES' | wc -l) databases" +[ -z "$V" ] || echo "Backup directory: $DIR/$DATE" +for db in $DATABASES; do + [ -z "$V" ] || echo -n "Dumping $db ..." + mysqldump $OPTS --force --opt --events --databases $db | gzip > "$DIR/$DATE/$db.sql.gz" + [ -z "$V" ] || echo -e "\b\b\binto $DIR/$DATE/$db.sql.gz ($(du -h $DIR/$DATE/$db.sql.gz | cut -f1))" +done +[ -z "$V" ] || echo "Finished mySQL backup: $(date) ($(du -hs $DIR/$DATE/ | cut -f1))" + diff --git a/bash/backup-remote.sh b/bash/backup-remote.sh new file mode 100644 index 0000000..6de151c --- /dev/null +++ b/bash/backup-remote.sh @@ -0,0 +1,91 @@ +#!/bin/bash +## + # Sync with remote server and create Btrfs snapshots + # + # This scripts uses rsync to sync remote directories with a local copy + # After every successful sync a readonly Btrfs snapshot of this copy is + # created + # + # This script requires root privileges for creating Btrfs snapshots. + # Consider using public key authentification with SSH to allow root + # logins on remote machines: + # + # On remote side: + # echo "PermitRootLogin without-password" >> /etc/ssh/sshd_config: + # + # On local side: + # sudo ssh-keygen + # sudo cat /root/.ssh/id_dsa.pub | ssh user@remote 'cat >> /root/.ssh/authorized_keys' + # + # @copyright 2013 Steffen Vogel + # @license http://www.gnu.org/licenses/gpl.txt GNU Public License + # @author Steffen Vogel + # @link http://www.steffenvogel.de + ## +## + # This script is free software: you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation, either version 3 of the License, or + # any later version. + # + # This script is distributed in the hope that it will be useful, + # but WITHOUT ANY WARRANTY; without even the implied warranty of + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License + # along with this script. If not, see . + ## + +function usage { + echo "Usage: $(basename $0) SOURCE DEST" + echo + echo " SOURCE a path to the subvolume to backup" + echo " DEST a path to the backup destination" + exit 1 +} + +set -e + +if [ $# -ne 2 ]; then + echo -e "invalid args!" + echo + usage +fi + +DATE=$(date +%F_%H-%M-%S) + +SRC=$1 +DEST=$(readlink -f $2) + +if ! btrfs sub show $DEST/.current &> /dev/null; then + if [ -d $DEST/.current ]; then + echo -e "destination directory exists and is not a valid btrfs subvolume!" + echo + usage + else + btrfs sub create $DEST/.current + fi +fi + +# rsync options +OPTS="--archive --acls --xattrs" +OPTS+=" --progress --human-readable" +OPTS+=" --delete --delete-excluded" +OPTS+=" --exclude /dev/" +OPTS+=" --exclude /proc/" +OPTS+=" --exclude /sys/" +OPTS+=" --exclude /tmp/" +OPTS+=" --exclude /run/" +OPTS+=" --exclude /mnt/" +OPTS+=" --exclude /media/" +OPTS+=" --exclude /lost+found/" + +# sync with remote +rsync $OPTS $SRC $DEST/.current/ + +# create new readonly snapshot +btrfs subvolume snapshot -r $DEST/.current $DEST/$DATE + +# create symlink to latest snapshot +ln -rsfT $DATE latest diff --git a/bash/mount.luks.sh b/bash/mount.luks.sh new file mode 100755 index 0000000..334ea38 --- /dev/null +++ b/bash/mount.luks.sh @@ -0,0 +1,69 @@ +#!/bin/bash +## + # [u]mount(8) helper for luks encrypted disks + # + # Both mount and umount offer the ability to handover the mounting + # process to a helper script. This is usefull when mounting/unmounting + # luks encrypted disks. This helper combines the following steps for mounting + # a disk: + # + # 1. cryptsetup luksOpen DEV UUID + # 2. mount -o helper=luks /dev/mapper/UUID DIR + # + # respectivly for unmounting + # + # 1. umount -i DEV + # 2. cryptsetup luksClose UUID + # + # INSTALL: + # place this script in /sbin/mount.luks and make it executable. + # + # USAGE: + # mount -t luks /dev/sda1 /home + # + # or via /etc/fstab: + # /dev/sda1 /home luks defaults 0 0 + # followed by: + # mount /home + # + # @copyright 2013 Steffen Vogel + # @license http://www.gnu.org/licenses/gpl.txt GNU Public License + # @author Steffen Vogel + # @link http://www.steffenvogel.de + ## + +if [ "$(basename $0)" == "mount.luks" ]; then + DEV=$1 + DIR=$2 + + shift 2 + OPTS=$@ + + UUID=$(cryptsetup luksUUID $DEV) + if [ $? -ne 0 ]; then + echo -e "$DEV is not a LUKS device" + exit 1 + fi + + cryptsetup luksOpen $DEV $UUID + mount $OPTS -o helper=luks /dev/mapper/$UUID $DIR + + # NOTE: The mount option '-o helper=luks' is essentially required + # because the encrypted filesystem is not of type "luks". + # This option tells umount to use this helper script, + # instead of using the normal unmounting procedure and + # leaving the dm-crypt volume unclosed and therefore unproteced! + +elif [ "$(basename $0)" == "umount.luks" ]; then + DEV=$(mount | grep $1 | cut -f 1 -d " ") + UUID=$(basename $DEV) + + shift + OPTS=$@ + + umount -i $OPTS $DEV + # NOTE: The umount option '-i' is essentially required. It skips this + # helper script which would cause otherwise an endless self recursion + + cryptsetup luksClose $UUID +fi diff --git a/bash/mountcrypt.sh b/bash/mountcrypt.sh deleted file mode 100755 index 600477f..0000000 --- a/bash/mountcrypt.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -gpg -d /media/STEFFEN-KEY/.secret/luks.key.enc | sudo pmount -p - $1 $2 diff --git a/bash/mountl2p.sh b/bash/mountl2p.sh index b092a7e..5d1ba03 100755 --- a/bash/mountl2p.sh +++ b/bash/mountl2p.sh @@ -82,8 +82,7 @@ case ${FORMAT} in FORMAT="davs\://${L2P_USER}@www2.elearning.rwth-aachen.de\1/materials/documents L²P\:\2 \4" ;; *) - echo "invalid format!" >&2 - echo + echo -e "invalid format!" usage exit 1 esac diff --git a/bash/nsupdate-dhclient-exit-hook.sh b/bash/nsupdate-dhclient-exit-hook.sh new file mode 100644 index 0000000..605a597 --- /dev/null +++ b/bash/nsupdate-dhclient-exit-hook.sh @@ -0,0 +1,36 @@ +#!/bin/bash +## + # dhclient wrapper to update your dns + # + # @copyright 2013 Steffen Vogel + # @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0 + # @author Steffen Vogel + # @link http://www.steffenvogel.de + # + # Add this file to /etc/dhcp/dhclient-exit-hooks.d/nsupdate + # to update your dns autmatically when you get a new DHCP/IP lease from your ISP + ## +## + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + # or implied. See the License for the specific language governing + # permissions and limitations under the License. +## + +NS=/usr/local/bin/nsupdate.sh +key=/etc/bind/dhcp.key +zone=0l.de +host=wg.0l.de +server=127.0.0.1 + +case $reason in + BOUND|RENEW|REBIND|TIMEOUT) + $NS update -d $new_ip_address -k $key -z $zone -n $server -i $interface $host ;; + RELEASE) + $NS delete -d $old_ip_address -k $key -z $zone -n $server $host ;; +esac diff --git a/bash/nsupdate.sh b/bash/nsupdate.sh new file mode 100644 index 0000000..b5c340c --- /dev/null +++ b/bash/nsupdate.sh @@ -0,0 +1,159 @@ +#!/bin/bash +## + # Bind9 nsupdate wrapper + # + # @copyright 2013 Andrew Leonard + # @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0 + # @author Andrew Leonard + # @author Steffen Vogel + # @link http://www.steffenvogel.de + ## +## + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + # or implied. See the License for the specific language governing + # permissions and limitations under the License. +## + + +function usage { + echo "Usage: $0 CMD [FLAGS] HOST" + echo + echo " HOST is the hostname you want to update" + echo + echo " CMD is one of:" + echo " add, delete, update" + echo + echo " FLAGS are:" + echo " -n nameserver - DNS server to send updates to" + echo " -k file - Path to private key file" + echo " -y [hmac:]keyname:secret - key supplied via cli" + echo " -z zone - Zone to update" + echo " -t type - Record type; default is determined by -i,-4,-6 option" + echo " -d data - Record data / IP address" + echo " -i interface - Use the address of this interface as record data" + echo " -T ttl - Time to live for updated record; default: 1h." + echo " -4 / -6 use IP version" + exit 1 +} + +# parsing cmd +if [ "$1" == "add" -o "$1" == "delete" -o "$1" == "update" ]; then + CMD=$1 +else + echo -e "missing/invalid command" + echo + usage +fi + +shift 1 + +# default options +NS=localhost +TTL=3600 +OPTS= +VER=4 + +# parse arguments +while getopts "n:k:y:T:i:t:z:46" OPT ; do + case $OPT in + n) NS=$OPTARG ;; + k) KEYFILE=$OPTARG ;; + y) KEY=$OPTARG ;; + d) RDATA=$OPTARG ;; + t) TYPE=$OPTARG ;; + T) TTL=$OPTARG ;; + z) ZONE=$OPTARG ;; + i) IF=$OPTARG ;; + 4) VER=4 ;; + 6) VER=6 ;; + *) usage ;; + esac +done + +# clear all options and reset the command line +shift $((OPTIND-1)) + +# parsing host +if [ -n "$1" ]; then + HOST=$1 +else + echo -e "missing host" + echo + usage +fi + +if [ -n "$KEYFILE" ] ; then + OPTS="-k $KEYFILE" +elif [ -n "$KEY" ] ; then + OPTS="-y $KEY" +fi + +if [ -z "$ZONE" ] ; then + echo -e "missing zone" + echo + usage +fi + +if [ -z "$TYPE" ] ; then + case $VER in + 4) TYPE=A ;; + 6) TYPE=AAAA ;; + *) + echo "type missing" + usage + esac +fi + +# get current IPv4/6 address from net or interface +if [ -z "$RDATA" ] ; then + if [ -z "$IF" ] ; then + RDATA=$(curl -s 'http://checkip.dyndns.org' | sed 's/.*Current IP Address: \([0-9\.]\{7,15\}\).*/\1/') + else + RDATA=$(ip -o -$VER address show dev $IF | sed -nr 's/.*inet6? ([^/ ]+).*/\1/p') + fi + +fi + +OPTS="$OPTS -v" + +# update zone +case $CMD in + add) + nsupdate $OPTS <> /var/log/uptime.log diff --git a/gc.com_spider/cookie.txt b/gc.com_spider/cookie.txt deleted file mode 100755 index 099071a..0000000 --- a/gc.com_spider/cookie.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Netscape HTTP Cookie File -# http://curlm.haxx.se/rfc/cookie_spec.html -# This file was generated by libcurl! Edit at your own risk. - -#HttpOnly_www.geocaching.com FALSE / FALSE 0 ASP.NET_SessionId kpnkhincysmgh2z2wwxayp55 diff --git a/gc.com_spider/.buildpath b/gc_spider/.buildpath similarity index 100% rename from gc.com_spider/.buildpath rename to gc_spider/.buildpath diff --git a/gc.com_spider/gc.kml b/gc_spider/gc.kml similarity index 100% rename from gc.com_spider/gc.kml rename to gc_spider/gc.kml diff --git a/gc.com_spider/icons/accept.png b/gc_spider/icons/accept.png similarity index 100% rename from gc.com_spider/icons/accept.png rename to gc_spider/icons/accept.png diff --git a/gc.com_spider/icons/delete.png b/gc_spider/icons/delete.png similarity index 100% rename from gc.com_spider/icons/delete.png rename to gc_spider/icons/delete.png diff --git a/gc.com_spider/icons/gc-cito.gif b/gc_spider/icons/gc-cito.gif similarity index 100% rename from gc.com_spider/icons/gc-cito.gif rename to gc_spider/icons/gc-cito.gif diff --git a/gc.com_spider/icons/gc-earthcache.gif b/gc_spider/icons/gc-earthcache.gif similarity index 100% rename from gc.com_spider/icons/gc-earthcache.gif rename to gc_spider/icons/gc-earthcache.gif diff --git a/gc.com_spider/icons/gc-event.gif b/gc_spider/icons/gc-event.gif similarity index 100% rename from gc.com_spider/icons/gc-event.gif rename to gc_spider/icons/gc-event.gif diff --git a/gc.com_spider/icons/gc-letterbox.gif b/gc_spider/icons/gc-letterbox.gif similarity index 100% rename from gc.com_spider/icons/gc-letterbox.gif rename to gc_spider/icons/gc-letterbox.gif diff --git a/gc.com_spider/icons/gc-megaevent.gif b/gc_spider/icons/gc-megaevent.gif similarity index 100% rename from gc.com_spider/icons/gc-megaevent.gif rename to gc_spider/icons/gc-megaevent.gif diff --git a/gc.com_spider/icons/gc-multi.gif b/gc_spider/icons/gc-multi.gif similarity index 100% rename from gc.com_spider/icons/gc-multi.gif rename to gc_spider/icons/gc-multi.gif diff --git a/gc.com_spider/icons/gc-mystery.gif b/gc_spider/icons/gc-mystery.gif similarity index 100% rename from gc.com_spider/icons/gc-mystery.gif rename to gc_spider/icons/gc-mystery.gif diff --git a/gc.com_spider/icons/gc-traditional.gif b/gc_spider/icons/gc-traditional.gif similarity index 100% rename from gc.com_spider/icons/gc-traditional.gif rename to gc_spider/icons/gc-traditional.gif diff --git a/gc.com_spider/icons/gc-virtual.gif b/gc_spider/icons/gc-virtual.gif similarity index 100% rename from gc.com_spider/icons/gc-virtual.gif rename to gc_spider/icons/gc-virtual.gif diff --git a/gc.com_spider/icons/gc-webcam.gif b/gc_spider/icons/gc-webcam.gif similarity index 100% rename from gc.com_spider/icons/gc-webcam.gif rename to gc_spider/icons/gc-webcam.gif diff --git a/gc.com_spider/include/classes/gc.php b/gc_spider/include/classes/gc.php similarity index 100% rename from gc.com_spider/include/classes/gc.php rename to gc_spider/include/classes/gc.php diff --git a/gc.com_spider/index.php b/gc_spider/index.php similarity index 100% rename from gc.com_spider/index.php rename to gc_spider/index.php diff --git a/gc.com_spider/json_response b/gc_spider/json_response similarity index 100% rename from gc.com_spider/json_response rename to gc_spider/json_response diff --git a/gc.com_spider/kml.php b/gc_spider/kml.php similarity index 100% rename from gc.com_spider/kml.php rename to gc_spider/kml.php diff --git a/gc.com_spider/post_request_data b/gc_spider/post_request_data similarity index 100% rename from gc.com_spider/post_request_data rename to gc_spider/post_request_data diff --git a/php/campus/cocal.db b/php/campus/cocal.db deleted file mode 100644 index c71f666..0000000 Binary files a/php/campus/cocal.db and /dev/null differ diff --git a/php/campus/cocal.php b/php/campus/cocal.php index d4a4512..44472c6 100644 --- a/php/campus/cocal.php +++ b/php/campus/cocal.php @@ -104,6 +104,7 @@ function crawl_address($room) { return (count($matches)) ? $matches : false; } +/* send HTTP 500 for Google to stop fetching */ function error() { global $scriptUrl; @@ -194,16 +195,24 @@ if (isset($matrnr) && isset($passwd)) { } $address = array(); + $category = ''; $lines = explode("\r\n", $body); foreach ($lines as $line) { if ($line) { list($key, $value) = explode(":", $line); switch ($key) { case 'END': - if ($value == 'VEVENT') flush(); - $address = array(); + if ($value == 'VEVENT') { + flush(); + $address = array(); + $category = ''; + } break; + case 'CATEGORIES': + $category = $value; + + case 'LOCATION': $matches = array(); if (preg_match('/^([0-9]+\|[0-9]+)/', $value, $matches)) { @@ -225,20 +234,20 @@ if (isset($matrnr) && isset($passwd)) { $additional = $value; $value = ''; - if (@$address['building_no'] && @$address['room_no']) - $value .= '\n' . $address['building_no'] . '|' . $address['room_no']; + if (@$address['building'] || @$address['building_no']) + $value .= '\nGebäude: ' . $address['building_no'] . ' ' . $address['building']; - if (@$address['room']) - $value .= ' ' . $address['room']; - - if (@$address['building']) - $value .= '\n' . 'Gebäude: ' . $address['building']; + if (@$address['room'] || @$address['room_no']) + $value .= '\nRaum: ' . $address['room_no'] . ' ' . $address['room']; if (@$address['floor']) - $value .= '\n' . 'Geschoss: ' . $address['floor']; + $value .= '\nGeschoss: ' . $address['floor']; if (@$address['cluster']) - $value .= '\n' . 'Campus: ' . preg_replace('/^Campus /', '', $address['cluster']); + $value .= '\nCampus: ' . preg_replace('/^Campus /', '', $address['cluster']); + + if (@$category) + $value .= '\nTyp: ' . $category; if ($additional && $additional != 'Kommentar') $value .= '\n' . $additional; diff --git a/sms_contact/aws.php b/sms_contact/aws.php deleted file mode 100644 index 6e77544..0000000 --- a/sms_contact/aws.php +++ /dev/null @@ -1,38 +0,0 @@ -getBalance(); - $message = preg_replace('/\r?\n/m', '\n', trim($json['Message'])); - - if ($balance < $config['reserve']) { - header("HTTP/1.0 402 Payment Required"); - } - else { - $sipgate->sendSMS($config['recipient'], $message, NULL, $config['recipient']); - } - break; - - default: - header("HTTP/1.1 501 Not Implemented"); - } -} -else { - header("HTTP/1.1 405 Method Not Allowed"); -} - -?> diff --git a/sms_contact/xmlrpc/xmlrpc.inc b/sms_contact/xmlrpc/xmlrpc.inc index b3658f0..f6a7ee0 100644 --- a/sms_contact/xmlrpc/xmlrpc.inc +++ b/sms_contact/xmlrpc/xmlrpc.inc @@ -820,7 +820,7 @@ var $key=''; var $keypass=''; var $verifypeer=true; - var $verifyhost=1; + var $verifyhost=2; var $no_multicall=false; var $proxy=''; var $proxyport=0; @@ -3773,4 +3773,4 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha } } -?> \ No newline at end of file +?>