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

diff --git a/cards/update_card.sh b/cards/update_card.sh
index d942e9a..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
 
@@ -105,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
@@ -126,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"
@@ -146,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