X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Fnew_card.sh;h=0273a2cb44ac481c2c6f7554e3e3782a855be3a0;hp=2d6c39b3ff4200f0952697e051e43a7b73e37107;hb=5d52b5c71310d367a240991e6d3ce82fa1c742ab;hpb=43e7c60df0632fd383306a2d3c6dc8c4213d4b9d

diff --git a/cards/new_card.sh b/cards/new_card.sh
index 2d6c39b..0273a2c 100755
--- a/cards/new_card.sh
+++ b/cards/new_card.sh
@@ -1,6 +1,6 @@
-#!/bin/zsh
+#!/bin/sh
 
-# Copyright 2014 Paul Hänsch
+# Copyright 2014, 2019 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -17,29 +17,58 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-cgi_post
-cgi_refdata
+filter="$(REF f)"
+order="$(REF o)"
 
-filter="&filter=${_REF[filter]}"
-filtertype="&filtertype=${_REF[filtertype]}"
-order="&order=${_REF[order]}"
-
-uid=$(uuidgenerator)
+uid="$(timeid)$(randomid)"  # 32 Octets UID, starting with timestamp
 card="${uid}.vcf"
 
-tempfile="$_DATA/temp/$card"
-
-cat >"$tempfile" <<EOF
-BEGIN:VCARD
-VERSION:4.0
-N:;;;;
-BDAY:
-TEL:
-EMAIL:
-ADR:
-NOTE:
-UID:$uid
-END:VCARD
-EOF
-
-echo -n "Location: ?p=cards${filter}${filtertype}${order}&edit=$card\n\n"
+vcf_escape(){
+  for each in "$@"; do
+    printf %s\\n "$each" \
+    | sed -E ':X;$!{N;bX}; s;\r\n;\n;g; s;([;,\\]);\\\1;g; s;\n;\\n;g;'
+  done \
+  | sed -E ':X;$!{N;bX}; s;\n;\;;g'
+}
+
+IFS='|' read -r date fn ln bmonth byear tel tcell junk1 email junk2 note <<-EOF
+	$(POST seed |tr \\t \|)
+	EOF
+
+[ ${#byear} = 1 ] && byear="200$byear"
+[ ${#byear} = 2 ] && byear="20$byear"
+[ ${#bmonth} = 1 ] && bmonth="0$bmonth"
+
+mn=""
+case $fn in
+  *\ *)
+    mn="${fn#* }"
+    fn="${fn%% *}"
+    ;;
+esac
+
+mkdir -p "${_DATA}/lock/vcard/"
+lockdir="${_DATA}/lock/vcard/${card}/"
+lockfile=${lockdir}/${SESSION_ID}
+
+if mkdir "$lockdir"; then
+  cat >"$lockfile" <<-EOF
+	BEGIN:VCARD
+	VERSION:4.0
+	N:$(vcf_escape "$ln" "$fn" "$mn" "" "")
+	FN:$(vcf_escape "${fn}${mn:+ }${mn} ${ln}")
+	BDAY:$(parse_date "${byear}-${bmonth}-01")
+	TEL:$(vcf_escape "$tel")
+	TEL;TYPE=CELL:$(vcf_escape "$tcell")
+	EMAIL:$(vcf_escape "$email")
+	X-ZACK-JOINDATE:$(parse_date "$date")
+	ADR:
+	NOTE:$(vcf_escape "$note")
+	UID:${uid}
+	END:VCARD
+	EOF
+  REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+else
+  SET_COOKIE session message="EDITLOCK"
+  REDIRECT "/cards/?o=${order}&f=${filter}"
+fi