X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=actions%2Fupdate_attendee.sh;h=4bdd6ba6a7e8bfe16ea6bf437693ad4f0735063e;hp=078d0966b232427c45a97381086ae440983044de;hb=af7ea29c5a4a36bce464f2b9b80ea448cbbf7ec9;hpb=b3ddca9d8e6af72d0e9847b3d5d1f7778ef1f1af

diff --git a/actions/update_attendee.sh b/actions/update_attendee.sh
old mode 100644
new mode 100755
index 078d096..4bdd6ba
--- a/actions/update_attendee.sh
+++ b/actions/update_attendee.sh
@@ -1,63 +1,89 @@
 #!/bin/zsh
 
+# Copyright 2014 Paul Hänsch
+#
+# This file is part of Confetti.
+# 
+# Confetti is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Confetti 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 Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
+
 cgi_post
 cgi_refdata
 
-filter="&filter=$_REF[\"filter\"]"
-filtertype="&filtertype=$_REF[\"filtertype\"]"
-order="&order=$_REF[\"order\"]"
+filter="&filter=${_REF[filter]}"
+filtertype="&filtertype=${_REF[filtertype]}"
+order="&order=${_REF[order]}"
 
-card="$_POST[\"card\"]"
+card="${_POST[card]}"
 tempfile="$_DATA/temp/$card"
 cardfile="$_DATA/vcard/$card"
 attfile="$_DATA/mappings/attendance"
 
+_POST[0N]="$(echo "${_POST[0N]}" |sed 's:;: :')"
+_POST[1N]="$(echo "${_POST[1N]}" |sed 's:;: :')"
+_POST[2N]="$(echo "${_POST[2N]}" |sed 's:;: :')"
+_POST[3N]="$(echo "${_POST[3N]}" |sed 's:;: :')"
+_POST[4N]="$(echo "${_POST[4N]}" |sed 's:;: :')"
+
 echo "BEGIN:VCARD\r" >"$tempfile"
 echo "VERSION:4.0\r" >>"$tempfile"
-echo "N:$_POST[\"0N\"];$_POST[\"1N\"];$_POST[\"2N\"];$_POST[\"3N\"];$_POST[\"4N\"]\r" >>"$tempfile"
-echo "UID:$_POST[\"UID\"]\r" >>"$tempfile"
+echo "N:${_POST[0N]};${_POST[1N]};${_POST[2N]};${_POST[3N]};${_POST[4N]}\r" >>"$tempfile"
+echo "UID:${_POST[UID]}\r" >>"$tempfile"
 for field in $VCF_FIELDS; do
-  value="$_POST[\"$field\"]"
+  value="${_POST[$field]}"
   n=0
   while [ -n "$value" ]; do
     value="$(echo "$value" |sed -r ':a;N;$!ba;s:\n:\\\\n:g;s:\r:\\\\r:g')"
     echo "${field}:${value}\r"
-    value="$_POST[\"$field$n\"]"
+    value="${_POST[$field$n]}"
     n=$(($n + 1))
   done
 done >>"$tempfile"
 
-case "$_POST[\"action\"]" in
+case "${_POST[action]}" in
   addfield)
-    echo "$_POST[\"newfield\"]:\r" >>"$tempfile"
+    echo "${_POST[newfield]}:\r" >>"$tempfile"
     echo "END:VCARD\r" >>"$tempfile"
-    echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}&edit=$card\n\n"
+    echo -n "Location: ?p=attendees${filter}${filtertype}${order}&edit=$card\n\n"
     ;;
   update)
     attendance=()
     for att in attendance attendance{0..100}; do
-      [ -n "$_POST[\"$att\"]" ] && attendance+=("$_POST[\"$att\"]")
+      [ -n "${_POST[$att]}" ] && attendance+=("${_POST[$att]}")
     done
     sed -rn 's:^(.+)'$card'$:\1:p' "$attfile" |while read course; do
       touch "$_DATA/ical/$course"
     done
     sed -i -r '/^(.+)\t'$card'$/d' "$attfile"
     for each in $attendance; do
-      echo "$each\t$card" >>"$attfile"
+      echo "$each\t$card"
+    done >>"$attfile"
+    sed -rn 's:^(.+)'$card'$:\1:p' "$attfile" |while read course; do
+      touch "$_DATA/ical/$course"
     done
 
     echo "END:VCARD\r" >>"$tempfile"
     mv "$tempfile" "$cardfile"
-    echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}#$card\n\n"
+    echo -n "Location: ?p=attendees${filter}${filtertype}${order}#$card\n\n"
     ;;
   cancel)
     rm "$tempfile"
     [ -f "$cardfile" ] \
-      && echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}#$card\n\n" \
-      || echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}\n\n"
+      && echo -n "Location: ?p=attendees${filter}${filtertype}${order}#$card\n\n" \
+      || echo -n "Location: ?p=attendees${filter}${filtertype}${order}\n\n"
     ;;
   delete)
     rm "$tempfile" "$cardfile"
-    echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}\n\n"
+    echo -n "Location: ?p=attendees${filter}${filtertype}${order}\n\n"
     ;;
 esac