tidy up

[confetti] / cards / edit_card.sh

diff --git a/cards/edit_card.sh b/cards/edit_card.sh
index 6b62395ecb532936f99ae6189d51506e9ee62c47..4239cc5968c03b5e58d11a96d0e0ae22f68de41f 100755 (executable)
--- a/cards/edit_card.sh
+++ b/cards/edit_card.sh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/bin/sh
 
 # Copyright 2019 Paul Hänsch
 #
@@ -17,19 +17,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-mkdir -p "${_DATA}/lock"
-
-card="$(GET card)"
-lock="$_DATA/lock/${card}/"
-cardfile="$_DATA/vcard/$card"
-tempfile="$lock/temp.vcf"
+locktimeout=900
+. "$_EXEC"/session_lock.sh
 
+card="$(GET card |PATH)"
+cardfile="$_DATA/vcard/${card##*/}"
 filter="$(REF f)"
 order="$(REF o)"
 
-if mkdir "$lock" 2>&-; then
-  cp "$cardfile" "$tempfile"
+if tempfile="$(SLOCK "$cardfile" "$locktimeout")"; then
   REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+elif [ -f "$tempfile" ]; then
+  SET_COOKIE session message="SESSLOCK"
+  REDIRECT "/cards/?o=${order}&f=${filter}#${card}"
 else
   SET_COOKIE session message="EDITLOCK"
   REDIRECT "/cards/?o=${order}&f=${filter}#${card}"