X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=actions%2Fupdate_attendee.sh;h=1fcd3ec54f62e1c1cb4a89704c1fbcc6a7493dd4;hp=6f46cb2034eaeda33c967523fcb59fde5d1126a6;hb=c195881a2389862d4bfcd2fd55ca868f7a20b8e8;hpb=d959549ee6cec995f6e8975002b3bc0e9375e564

diff --git a/actions/update_attendee.sh b/actions/update_attendee.sh
index 6f46cb2..1fcd3ec 100644
--- a/actions/update_attendee.sh
+++ b/actions/update_attendee.sh
@@ -1,6 +1,11 @@
 #!/bin/zsh
 
 cgi_post
+cgi_refdata
+
+filter="&filter=$_REF[\"filter\"]"
+filtertype="&filtertype=$_REF[\"filtertype\"]"
+order="&order=$_REF[\"order\"]"
 
 card="$_POST[\"card\"]"
 tempfile="temp/$card"
@@ -9,10 +14,12 @@ cardfile="vcard/$card"
 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"
 for field in $VCF_FIELDS; do
   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\"]"
     n=$(($n + 1))
@@ -23,15 +30,21 @@ case "$_POST[\"action\"]" in
   addfield)
     echo "$_POST[\"newfield\"]:\r" >>"$tempfile"
     echo "END:VCARD\r" >>"$tempfile"
-    echo -n "Location: http://$HTTP_HOST/?page=attendees&edit=$card#$card\n\n"
+    echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}&edit=$card\n\n"
     ;;
   update)
     echo "END:VCARD\r" >>"$tempfile"
     mv "$tempfile" "$cardfile"
-    echo -n "Location: http://$HTTP_HOST/?page=attendees#$card\n\n"
+    echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}#$card\n\n"
     ;;
   cancel)
     rm "$tempfile"
-    echo -n "Location: http://$HTTP_HOST/?page=attendees#$card\n\n"
+    [ -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"
+    ;;
+  delete)
+    rm "$tempfile" "$cardfile"
+    echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}\n\n"
     ;;
 esac