X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=cards%2Fupdate_card.sh;h=c13b6ec2cbf251e4eda4b5f97363b33e900104ba;hb=8536e089bb0d5f7af527aacc63d435e45b7e6770;hp=52ccfcda6e2d7cefe3106866055e462b09657350;hpb=d6e018a83d2f0305b773ec01d8c27f8ce930a9b5;p=lobster

diff --git a/cards/update_card.sh b/cards/update_card.sh
index 52ccfcd..c13b6ec 100755
--- a/cards/update_card.sh
+++ b/cards/update_card.sh
@@ -20,15 +20,24 @@
 . "$_EXEC/pdiread.sh"
 . "$_EXEC/session_lock.sh"
 
+unset filter order card action newfield
+unset cardfile attfile tempfile
+unset vcf field cnt delete_key
+
 filter="$(REF f)"
 order="$(REF o)"
 
-card="$(POST card)"
-cardfile="$_DATA/vcard/$card"
+card="$(POST card |PATH)"
+cardfile="$_DATA/vcard/${card##*/}"
 attfile="$_DATA/mappings/attendance"
 
 action="$(POST action)"
-newfield="$(POST newfield)"
+newfield="$(POST newfield |grep -m 1 -xE '[A-Z][A-Z0-9-]*')"
+
+if printf '%s\n' "$action" |grep -qxE 'addfield [A-Z][A-Z0-9]*'; then
+  newfield="${action##* }"
+  action=addfield
+fi
 
 if ! tempfile=$(CHECK_SLOCK "$cardfile"); then
   SET_COOKIE 0 message="NO VALID FILE LOCK"
@@ -62,6 +71,20 @@ for field in $(POST_KEYS |grep -xE '[A-Z][A-Z0-9-]*'); do
       # (TEL)
       #   printf '%s;TYPE=%s:%s\r\n' "${field}" "${_POST[phonetype${key#TEL}]}" "$(vcf_escape "$(POST "$field" "$cnt")")"
       #   ;;
+      X-HEALTH-INSURANCE)
+        hi_select="$(POST "$field" "$cnt")"
+        if [ "$hi_select" = list ]; then
+          vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(vcf_escape "$(POST "hi_company" "$cnt")" \
+                                                                       "$(POST "hi_number" "$cnt")" \
+                                                                       "$(POST "hi_status" "$cnt")" \
+                                                          )")"
+        elif [ "$hi_select" = other ]; then
+          vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(vcf_escape "$(POST "hi_other" "$cnt")" \
+                                                                       "$(POST "hi_number" "$cnt")" \
+                                                                       "$(POST "hi_status" "$cnt")" \
+                                                          )")"
+        fi
+        ;;
       TEL)
          vcf="$(pdi_update_attrib "$vcf" TEL $cnt TYPE="$(POST teltype $cnt |grep -Exm1 'HOME|WORK|CELL|FAX')")"
          vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(vcf_escape "$(POST "$field" "$cnt")")")"
@@ -89,7 +112,7 @@ printf '%s' "$vcf" |grep -vx '' >"$tempfile"
 
 case "$action" in
   addfield)
-    REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+    REDIRECT "/cards/?o=${order}&f=${filter}&e=${card#/}"
     ;;
   update)
     # attendance=()
@@ -109,12 +132,12 @@ case "$action" in
 
     cp "$tempfile" "$cardfile"
     RELEASE_SLOCK "$cardfile"
-    REDIRECT "/cards/?o=${order}&f=${filter}#${card}"
+    REDIRECT "/cards/?o=${order}&f=${filter}#${card#/}"
     ;;
   cancel)
     RELEASE_SLOCK "$cardfile"
     [ -f "$cardfile" ] \
-    && REDIRECT "/cards/?o=${order}&f=${filter}#${card}" \
+    && REDIRECT "/cards/?o=${order}&f=${filter}#${card#/}" \
     || REDIRECT "/cards/?o=${order}&f=${filter}"
     ;;
   delete)