X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=pages%2Fcards.sh;h=0ead803fb32304a581ba5fcdaae35bcd2e8413de;hp=f2675ba0f7a9301baa88852376c9943791d2335b;hb=e7f611ea33c1a8c8165088db41f04c6a903018c8;hpb=69e661b5c8ec195bd3c4998a623a60607b47059e

diff --git a/pages/cards.sh b/pages/cards.sh
index f2675ba..0ead803 100755
--- a/pages/cards.sh
+++ b/pages/cards.sh
@@ -17,7 +17,28 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
-[ -z "${_GET[order]}" ] && _GET[order]="firstname"
+BR='
+'
+
+case $PROFILE in
+medical)
+  view_card="$_EXEC/templates/view_client.sh"
+  edit_card="$_EXEC/templates/edit_client.sh"
+  _GET[order]="${_GET[order]:-lastname}"
+  _GET[filtertype]="${_GET[filtertype]:-name}"
+  profile_medical=x
+;;
+circus)
+  view_card="$_EXEC/templates/view_attendee.sh"
+  edit_card="$_EXEC/templates/edit_attendee.sh"
+  _GET[order]="${_GET[order]:-firstname}"
+  _GET[filtertype]="${_GET[filtertype]:-any}"
+  profile_circus=x
+;;
+esac
+
+edit="${_GET[edit]}"
+[ \! -f "vcard/$edit" -a \! -f "temp/$edit" ] && edit=''
 
 listcourses() {
   ls -1 ${_DATA}/ical/*ics |while read file; do
@@ -26,6 +47,11 @@ listcourses() {
   done |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:'
 }
 
+list_hi_companies(){
+  sed -rn 's;^X-HEALTH-INSURANCE:([^\;]+)\;.*$;\1;p' ${_DATA}/vcard/*vcf \
+  | sort -u
+}
+
 listcards() {
   case "${_GET[filtertype]}" in
     any)
@@ -76,132 +102,63 @@ listcards() {
 }
 
 vcf_parse() {
-  tr -d '\n' <"$1" |sed -r 's:\r ::g;s:\r:\n:g' \
+  sed -r ':X;N;$!bX; s;\r\n[ \t];;g; s;\r\n;\n;g;' "$1" \
   | sed -rn '
-    s:^PHOTO:001 PHOTO:p;
-    s:^X-MS-CARDPICTURE:001 PHOTO:p;
-    s:^LOGO:002 LOGO:p;
-    s:^FN:003 FN:p;
-    s:^N[\:;]:004 &:p
-    s:^NICKNAME:005 NICKNAME:p;
-    s:^SOUND:006 SOUND:p;
-    s:^GENDER:007 GENDER:p;
-    s:^X-GENDER:007 GENDER:p;
-    s:^KIND:008 KIND:p;
-    s:^TITLE:009 TITLE:p;
-    s:^ROLE:010 ROLE:p;
-    s:^ORG:011 ORG:p;
-    s:^MEMBER:012 MEMBER:p;
-    s:^CATEGORIES:013 CATEGORIES:p;
-    s:^ANNIVERSARY:014 ANNIVERSARY:p;
-    s:^X-ANNIVERSARY:014 ANNIVERSARY:p;
-    s:^X-EVOLUTION-ANNIVERSARY:014 ANNIVERSARY:p;
-    s:^X-KADDRESSBOOK-X-Anniversary:014 ANNIVERSARY:p;
-    s:^BDAY:015 BDAY:p;
-    s:^EMAIL:016 EMAIL:p;
-    s:^TEL:017 TEL:p;
-    s:^IMPP:018 IMPP:p;
-    s:^X-AIM(;[^"\:]+|;"[^"]+")*\:(.*)$:018 IMPP\1\:aim\:\2:p;
-    s:^X-ICQ(;[^"\:]+|;"[^"]+")*\:(.*)$:018 IMPP\1\:aim\:\2:p;
-    s:^X-GOOGLE-TALK(;[^"\:]+|;"[^"]+")*\:(.*)$:018 IMPP\1\:xmpp\:\2:p;
-    s:^X-JABBER(;[^"\:]+|;"[^"]+")*\:(.*)$:018 IMPP\1\:xmpp\:\2:p;
-    s:^X-MSN(;[^"\:]+|;"[^"]+")*\:(.*)$:018 IMPP\1\:msn\:\2:p;
-    s:^X-YAHOO(;[^"\:]+|;"[^"]+")*\:(.*)$:018 IMPP\1\:ymsgr\:\2:p;
-    s:^X-SIP(;[^"\:]+|;"[^"]+")*\:(sip\:)?(.*)$:018 IMPP\1\:sip\:\3:p;
-    s:^ADR:019 ADR:p;
-    s:^LABEL(;[^"\:]+|;"[^"]+")*\:(.*)$:019 ADR;LABEL="\2"\1\::p;
-    s:^URL:021 URL:p;
-    s:^X-EVOLUTION-BLOG-URL:021 URL:p;
-    s:^LANG:022 LANG:p;
-    s:^NOTE:023 NOTE:p;
-    s:^UID:026 UID:p;
+    # === turn property names to upper case ===
+    h; s;^([^\;:]+);;;
+    x; s;^([^\;:]+).*$;\1;;
+    y;abcdefghijklmnopqrstuvwxyz;ABCDEFGHIJKLMNOPQRSTUVWXYZ;
+    G; s;\n;;;
 
-    s:^RELATED:025 RELATED:p;
-    s:^AGENT:025 RELATED\;TYPE=agent:p;
-    s:^X-ASSISTANT:025 RELATED\;TYPE=assistant;VALUE=text:p;
-    s:^X-EVOLUTION-ASSISTANT:025 RELATED\;TYPE=assistant;VALUE=text:p;
-    s:^X-KADDRESSBOOK-X-AssistantsName:025 RELATED\;TYPE=assistant;VALUE=text:p;
-    s:^X-MANAGER:025 RELATED\;TYPE=manager;VALUE=text:p;
-    s:^X-EVOLUTION-MANAGER:025 RELATED\;TYPE=manager;VALUE=text:p;
-    s:^X-KADDRESSBOOK-X-ManagersName:025 RELATED\;TYPE=manager;VALUE=text:p;
-    s:^X-SPOUSE:025 RELATED\;TYPE=spouse;VALUE=text:p;
-    s:^X-EVOLUTION-SPOUSE:025 RELATED\;TYPE=spouse;VALUE=text:p;
-    s:^X-KADDRESSBOOK-X-SpouseName:025 RELATED\;TYPE=spouse;VALUE=text:p;
+    # === Normalise various known vendor properties ===
+                s;^X-MS-CARDPICTURE(\;|:);PHOTO\1;;
+                        s;^X-GENDER(\;|:);GENDER\1;;
+                   s;^X-ANNIVERSARY(\;|:);ANNIVERSARY\1;;
+         s;^X-EVOLUTION-ANNIVERSARY(\;|:);ANNIVERSARY\1;;
+    s;^X-KADDRESSBOOK-X-ANNIVERSARY(\;|:);ANNIVERSARY\1;;
+            s;^X-EVOLUTION-BLOG-URL(\;|:);URL\1;;
+                              s;^AGENT(\;|:);RELATED\;VALUE=text\;TYPE=agent\1;;
+                        s;^X-ASSISTANT(\;|:);RELATED\;VALUE=text\;TYPE=assistant\1;;
+              s;^X-EVOLUTION-ASSISTANT(\;|:);RELATED\;VALUE=text\;TYPE=assistant\1;;
+    s;^X-KADDRESSBOOK-X-ASSISTANTSNAME(\;|:);RELATED\;VALUE=text\;TYPE=assistant\1;;
+                          s;^X-MANAGER(\;|:);RELATED\;VALUE=text\;TYPE=manager\1;;
+                s;^X-EVOLUTION-MANAGER(\;|:);RELATED\;VALUE=text\;TYPE=manager\1;;
+      s;^X-KADDRESSBOOK-X-MANAGERSNAME(\;|:);RELATED\;VALUE=text\;TYPE=manager\1;;
+                           s;^X-SPOUSE(\;|:);RELATED\;VALUE=text\;TYPE=spouse\1;;
+                 s;^X-EVOLUTION-SPOUSE(\;|:);RELATED\;VALUE=text\;TYPE=spouse\1;;
+        s;^X-KADDRESSBOOK-X-SPOUSENAME(\;|:);RELATED\;VALUE=text\;TYPE=spouse\1;;
 
-    s:^BEGIN.*$:000 &:p;
-    s:^CALADRURI.*$::;
-    s:^CALURI.*$::;
-    s:^CLASS.*$::;
-    s:^CLIENTPIDMAP.*$::;
-    s:^END.*$:100 &:p;
-    s:^FBURL.*$::;
-    s:^GEO.*$::;
-    s:^MAILER.*$::;
-    s:^NAME.*$::;
-    s:^PRODID.*$::;
-    s:^PROFILE.*$::;
-    s:^REV.*$::;
-    s:^SORT-STRING.*$::;
-    s:^SOURCE.*$::;
-    s:^TZ.*$::;
-    s:^VERSION.*$:000 VERSION\:4.0:p;
-    s:^XML.*$::;
+    # === Normalise obsolete vendor IM properties ===
+            s;^X-AIM((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):;IMPP\1:aim:;;
+            s;^X-ICQ((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):;IMPP\1:aim:;;
+    s;^X-GOOGLE-TALK((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):;IMPP\1:xmpp:;;
+         s;^X-JABBER((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):;IMPP\1:xmpp:;;
+            s;^X-MSN((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):;IMPP\1:msn:;;
+          s;^X-YAHOO((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):;IMPP\1:ymsgr:;;
+            s;^X-SIP((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):(sip:)?;IMPP\1:sip:;;
 
-    s:^([A-Z].*)$:024 \1:p;
-    ' \
-  |sort |while read -r line; do
-    case "$line" in
-      00[012]*)
-	echo -E "$line"
-	;;
-      003*)
-	fn=$(echo -E "$line" |sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:\3:g' |tr -d '\r')
-	;;
-      004*)
-	n=$(echo -E "$line" \
-	  |sed -rn 's:^([0-9]{3} )([^;\:]+)(;[^"\:]+|;"[^"]+")*\:([^;]*)(\;[^;]*)(\;[^;]*)?(\;[^;]*)?(\;[^;]*)?$:\7 \5 \6 \4 \8:gp' \
-	  |sed -r 's:,: :;s:\;: :g;s: +: :g' \
-	  |tr -d '\r'
-	)
-	echo -E "$line"
-	;;
-      005*)
-	nick=$(echo -E "$line" |sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:\3:g' |tr -d '\r')
-	echo -E "$line"
-	;;
-      *)
-        [ -n "$n" ] && fn="$n"
-	#[ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
-	[ -n "$fn" ] && echo -E "003 FN:$fn" \
-	 	      || echo -E "003 FN:$nick"
-	echo -E "$line"
-	cat
-	;;
-    esac
-  done |tr -d '\r' \
-  | sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:key="\1"\nvalue="\3"\ntag=\2:g' \
-  | while read -r line; do
-    case "$line" in
-      key=*) echo -E "$line"
-	;;
-      value=*) echo -E "$line"
-	;;
-      tag=*) ot=''
-	     echo -E "$line" \
-	     | sed -r 's:^tag=::;s:\;([A-Z+_-]+="[^"]+"|[A-Z+_-]+=[^\;]+):\n\1:g;' \
-	     | sed -r 's:([A-Z+_-]+)="?(.*)"?:tag\[\1\]="\2":g' \
-	     | sed -r '/^ *$/d' \
-	     | sort |while read -r tag; do
-	       nt="$(echo -E "$tag" |sed -r 's:^tag\[([A-Z+_-]+)\]="(.*)"$:\1:')"
-	       nv="$(echo -E "$tag" |sed -r 's:^tag\[([A-Z+_-]+)\]="(.*)"$:\2:')"
-	       [ "$nt" = "$ot" ] && vl="$nv,$vl" || vl="$nv"
-	       echo -E "tag[$nt]=\"$vl\""
-	       ot="$nt"
-	     done
-	;;
-    esac
-  done \
-  | sed -r 's:[\\$`]:\\&:g'
+    # === Update obsolete LABEL property ===
+    s;^LABEL((\;[a-zA-Z0-9-]+|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):(.*)$;ADR\1\;LABEL="\5":;;
+
+    /^([a-zA-Z0-9-]+)((\;[a-zA-Z0-9-]+=?|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):(.*)$/{
+      h;
+      s;^([a-zA-Z0-9-]+)((\;[a-zA-Z0-9-]+=?|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):(.*)$;key='\''\1'\'';;
+      H; g;
+      s;^([a-zA-Z0-9-]+)((\;[a-zA-Z0-9-]+=?|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):([^\n]*)\n.*$;\6;;
+      s;'\'';'\'\\\\\'\'';g
+      s;^.*$;value='\''&'\'';
+      H; g;
+      s;^([a-zA-Z0-9-]+)((\;[a-zA-Z0-9-]+=?|\;[a-zA-Z0-9-]+=([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*)*):([^\n]*)\n.*$;\2;;
+      s;'\'';'\'\\\\\'\'';g
+      s;\;([a-zA-Z0-9-]+)(=|=(([^\;,:"]+|"[^"]+")(,[^\;,:"]+|,"[^"]+")*))?;\ntag[\1]='\''\3'\'';g
+      H; g;
+      s;^[^\n]*[\n ]+;;
+
+      s;\n[\n ]+;\n;g; s;\n$;;;
+
+      p;
+    }
+    '
 }
 
 view_card() {  #Parameter: Cardfile
@@ -223,7 +180,7 @@ view_card() {  #Parameter: Cardfile
           if [ -z "$key" ]; then
             eval "$line"
           else
-            values[$key]="$value"
+            values[$key]="${value//\\r\\n/$BR}"
             for t in ${(k)tag}; do
               tags[${key}_$t]="$tag[$t]"
             done
@@ -261,7 +218,7 @@ edit_card() {  #Parameter: Cardfile
         if [ -z "$key" ]; then
           eval "$line"
         else
-          [ -n "$value" ] && values[$key]="$value" || values[$key]='\r'
+          [ -n "$value" ] && values[$key]="${value//\\r\\n/$BR}" || values[$key]='\r'
           for t in ${(k)tag}; do
             tags[${key}_$t]="$tag[$t]"
           done