X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Fnew_card.sh;h=424f242904f027d46787a0e033cd488662bb71e7;hp=db353e1a1943b4eb00c5daa6dfd36cd9815e6679;hb=be9ce34edbd0d4305f438ba46883377597789ec1;hpb=85ff3b292b0775165a0b889b3714151f135bf84c

diff --git a/cards/new_card.sh b/cards/new_card.sh
index db353e1..424f242 100755
--- a/cards/new_card.sh
+++ b/cards/new_card.sh
@@ -23,6 +23,31 @@ order="$(REF o)"
 uid="$(timeid)$(randomid)"  # 32 Octets UID, starting with timestamp
 card="${uid}.vcf"
 
+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 bday 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"
+[ ${#bday} = 1 ] && bday="0$bday"
+
+mn=""
+case $fn in
+  *\ *)
+    mn="${fn#* }"
+    fn="${fn%% *}"
+    ;;
+esac
+
 mkdir -p "${_DATA}/lock/vcard/"
 lockdir="${_DATA}/lock/vcard/${card}/"
 lockfile=${lockdir}/${SESSION_ID}
@@ -31,12 +56,15 @@ if mkdir "$lockdir"; then
   cat >"$lockfile" <<-EOF
 	BEGIN:VCARD
 	VERSION:4.0
-	N:;;;;
-	BDAY:
-	TEL:
-	EMAIL:
+	N:$(vcf_escape "$ln" "$fn" "$mn" "" "")
+	FN:$(vcf_escape "${fn}${mn:+ }${mn} ${ln}")
+	BDAY:$(parse_date "${byear}-${bmonth}-${bday}")
+	TEL:$(vcf_escape "$tel")
+	TEL;TYPE=CELL:$(vcf_escape "$tcell")
+	EMAIL:$(vcf_escape "$email")
+	X-ZACK-JOINDATE:$(parse_date "$date")
 	ADR:
-	NOTE:
+	NOTE:$(vcf_escape "$note")
 	UID:${uid}
 	END:VCARD
 	EOF