X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Fupdate_card.sh;h=2b87632aea3208def628e80226996b32e1eb171b;hp=4ae9c19dc3426eac411779585d9712f6d5ca5b74;hb=HEAD;hpb=85ff3b292b0775165a0b889b3714151f135bf84c

diff --git a/cards/update_card.sh b/cards/update_card.sh
index 4ae9c19..d57f503 100755
--- a/cards/update_card.sh
+++ b/cards/update_card.sh
@@ -35,18 +35,18 @@ attfile="$_DATA/mappings/attendance"
 action="$(POST action)"
 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
+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"
-  REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+  REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}&e=${card}"
   exit 0
 elif [ "$(POST tid)" != "$(transid "$tempfile")" ]; then
   SET_COOKIE 0 message="INVALID TRANSACTION ID"
-  REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+  REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}&e=${card}"
   exit 0
 fi
 
@@ -62,9 +62,14 @@ vcf_escape(){
 # [ -n "${_POST[hi_company]}${_POST[hi_number]}${_POST[hi_status]}" ] \
 # && _POST[X-HEALTH-INSURANCE]="$(vcf_escape "${_POST[hi_company]}" "${_POST[hi_number]}" "${_POST[hi_status]}")"
 
-vcf="$(pdi_load "$cardfile")"
+vcf="$(pdi_load "$tempfile")"
 
-vcf="$(pdi_update_value "$vcf" N 1 "$(vcf_escape "$(POST 1N)" "$(POST 2N)" "$(POST 3N)" "$(POST 4N)" "$(POST 5N)")")"
+n1="$(POST 1N)" n2="$(POST 2N)" n3="$(POST 3N)" n4="$(POST 4N)" n5="$(POST 5N)"
+# 3N (Middle Names) is not actually used
+n3="${n2#${n2%% *}}"
+
+vcf="$(pdi_update_value "$vcf"  N 1 "$(vcf_escape "$n1" "${n2%% *}" "${n3# }" "$n4" "$n5")")"
+vcf="$(pdi_update_value "$vcf" FN 1 "$(vcf_escape "$n4 $n2 $n1 $n5" |sed -E 's;(^ +| +$);;g; s; +; ;g;')")"
 vcf="$(printf '%s\n' "$vcf" |sed -E "/^CATEGORIES;[^:]*:.*$/d")"
 
 for field in $(POST_KEYS |grep -xE '[A-Z][A-Z0-9-]*'); do
@@ -100,7 +105,7 @@ printf '%s' "$vcf" |grep -vx '' >"$tempfile"
 
 case "$action" in
   addfield)
-    REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+    REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}&e=${card}"
     ;;
   update)
     if LOCK "$attfile"; then
@@ -121,13 +126,13 @@ case "$action" in
 
     cp "$tempfile" "$cardfile"
     RELEASE_SLOCK "$cardfile"
-    REDIRECT "/cards/?o=${order}&f=${filter}#${card}"
+    REDIRECT "${_BASE}/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}"
+    && REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}#${card}" \
+    || REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}"
     ;;
   delete)
     rm "$cardfile"
@@ -141,6 +146,6 @@ case "$action" in
     else
       SET_COOKIE 0 message="COULD NOT UPDATE COURSE MAPPINGS"
     fi
-    REDIRECT "/cards/?o=${order}&f=${filter}"
+    REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}"
     ;;
 esac