X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;ds=sidebyside;f=cards%2Fupdate_card.sh;h=d57f5030a2431c564891d716c7f7a8ff5d769755;hb=207eb8177406ef0cc1f7629337a2c328394ba752;hp=a1143c3d72057359ef7b42a07c919c3d21ef33f4;hpb=43e7c60df0632fd383306a2d3c6dc8c4213d4b9d;p=confetti
diff --git a/cards/update_card.sh b/cards/update_card.sh
index a1143c3..d57f503 100755
--- a/cards/update_card.sh
+++ b/cards/update_card.sh
@@ -1,6 +1,6 @@
-#!/bin/zsh
+#!/bin/sh
-# Copyright 2014, 2016 Paul Hänsch
+# Copyright 2014, 2016, 2019, 2020, 2021 Paul Hänsch
#
# This file is part of Confetti.
#
@@ -17,86 +17,135 @@
# You should have received a copy of the GNU Affero General Public License
# along with Confetti. If not, see .
-cgi_refdata
+. "$_EXEC/pdiread.sh"
+. "$_EXEC/session_lock.sh"
+. "$_EXEC/cgilite/storage.sh"
-filter="&filter=${_REF[filter]}"
-filtertype="&filtertype=${_REF[filtertype]}"
-order="&order=${_REF[order]}"
+unset filter order card action newfield
+unset cardfile attfile tempfile
+unset vcf field cnt delete_key
-card="${_POST[card]}"
-tempfile="$_DATA/temp/$card"
-cardfile="$_DATA/vcard/$card"
+filter="$(REF f)"
+order="$(REF o)"
+
+card="$(POST card |PATH)"; card="${card##*/}"
+cardfile="$_DATA/vcard/${card}"
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
+ newfield="${action##* }"
+ action=addfield
+fi
+
+if ! tempfile=$(CHECK_SLOCK "$cardfile"); then
+ SET_COOKIE 0 message="NO VALID FILE LOCK"
+ 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 "${_BASE}/cards/?o=${order}&f=${filter}&e=${card}"
+ exit 0
+fi
+
vcf_escape(){
for each in "$@"; do
printf %s\\n "$each" \
- | sed -r ':X;$!{N;bX}; s;\r\n;\n;g; s;([;,\\]);\\\1;g; s;\n;\\n;g;'
+ | sed -E ':X;$!{N;bX}; s;\r\n;\n;g; s;([;,\\]);\\\1;g; s;\n;\\n;g;'
done \
- | sed -r ':X;$!{N;bX}; s;\n;\;;g'
+ | sed -E ':X;$!{N;bX}; s;\n;\;;g'
}
-[ "${_POST[hi_select]}" = "list" ] || _POST[hi_company]="${_POST[hi_other]}"
-[ -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]}")"
-
-sed -r 's;$;\r;' >"$tempfile" <"$tempfile"
+
+case "$action" in
addfield)
- redirect "?p=cards${filter}${filtertype}${order}&edit=$card"
+ REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}&e=${card}"
;;
update)
- attendance=()
- for att in attendance attendance{0..100}; do
- [ -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"
- done >>"$attfile"
- sed -rn 's:^(.+)'$card'$:\1:p' "$attfile" |while read course; do
- touch "$_DATA/ical/$course"
- done
-
- mv "$tempfile" "$cardfile"
- redirect "?p=cards${filter}${filtertype}${order}#$card"
+ if LOCK "$attfile"; then
+ grep -F " ${card}" "$attfile" |while read course junk; do
+ touch "$_DATA/ical/${course}"
+ done
+ sed -i -E "/^.+ ${card}\$/d" "$attfile"
+ seq 1 $(POST_COUNT attendance) |while read n; do
+ printf '%s %s\n' "$(POST attendance $n)" "$card"
+ done >>"$attfile"
+ grep -F " ${card}" "$attfile" |while read course junk; do
+ touch "$_DATA/ical/${course}"
+ done
+ RELEASE "$attfile"
+ else
+ SET_COOKIE 0 message="COULD NOT UPDATE COURSE MAPPINGS"
+ fi
+
+ cp "$tempfile" "$cardfile"
+ RELEASE_SLOCK "$cardfile"
+ REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}#${card}"
;;
cancel)
- rm "$tempfile"
+ RELEASE_SLOCK "$cardfile"
[ -f "$cardfile" ] \
- && redirect "?p=cards${filter}${filtertype}${order}#$card" \
- || redirect "?p=cards${filter}${filtertype}${order}"
+ && REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}#${card}" \
+ || REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}"
;;
delete)
- rm "$tempfile" "$cardfile"
- redirect "?p=cards${filter}${filtertype}${order}"
+ rm "$cardfile"
+ RELEASE_SLOCK "$cardfile"
+ if LOCK "$attfile"; then
+ grep -F " ${card}" "$attfile" |while read course junk; do
+ touch "$_DATA/ical/${course}"
+ done
+ sed -i -E "/^.+ ${card}\$/d" "$attfile"
+ RELEASE "$attfile"
+ else
+ SET_COOKIE 0 message="COULD NOT UPDATE COURSE MAPPINGS"
+ fi
+ REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}"
;;
esac