| sed -E ':X;$!{N;bX}; s;\n;\;;g'
}
-IFS='|' read -r date fn ln bmonth byear tel tcell junk1 email junk2 note <<-EOF
+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}/"
cat >"$lockfile" <<-EOF
BEGIN:VCARD
VERSION:4.0
- N:$(vcf_escape "$ln");$(vcf_escape "$fn");;;
- FN:$(vcf_escape "$fn $ln")
- BDAY:$(vcf_escape "${byear}-${bmonth}-01")
+ 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:$(vcf_escape "$date")
+ X-ZACK-JOINDATE:$(parse_date "$date")
ADR:
NOTE:$(vcf_escape "$note")
UID:${uid}
END:VCARD
EOF
- REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+ REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}&e=${card}"
else
SET_COOKIE session message="EDITLOCK"
- REDIRECT "/cards/?o=${order}&f=${filter}"
+ REDIRECT "${_BASE}/cards/?o=${order}&f=${filter}"
fi