X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Flist.sh;h=ab67fbd4edefcef625c3980dd003a64e385eb5cc;hp=8b911fb88e9bf63583d75702c79efccdeea81020;hb=a6e3da877a73be739ac96b12d9cde2190b24a423;hpb=3529f64e15cc4fa5e53e6d58a74cd20a09a29c7f

diff --git a/cards/list.sh b/cards/list.sh
index 8b911fb..ab67fbd 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -2,131 +2,130 @@
 
 . "${_EXEC}"/pdiread.sh
 
-unescape() { [ $# = 0 ] && sed -E 's;\\(.);\1;g' || printf %s "$*" |sed -E 's;\\(.);\1;g'; }
-upcase=' y;abcdefghijklmnopqrstuvwxyzäöüé;ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉ;; '
+edit_card(){
+  local cardfile="$_DATA/vcard/$1" 
+  local tempfile card
 
-card_fullname(){
-  local card="$1" n1 n2 n3 n4 n5
+  . $_EXEC/session_lock.sh
 
-  local N="$(pdi_value "$card" N)"
-  local FN="$(pdi_value "$card" FN)"
-  local NICKNAME="$(pdi_value "$card" NICKNAME)"
-
-  if [ "$FN" ]; then
-    printf %s "$FN"
-  elif [ "$N" ]; then
-    IFS=\; read n1 n2 n3 n4 n5 <<-EOF
-	$(pdi_value "$card" N)
+  if ! tempfile="$(CHECK_SLOCK "$cardfile")"; then
+    printf '[div .message %s]' "$(l10n "This card is not set up for editing within this session.")"
+  else
+    card="$(pdi_load "$tempfile")"
+    cat <<-EOF
+	[form .card #${cardfile##*/} action="/cards/update_card.sh" method="POST"
+	  [input type="hidden" name="tid" value="$(transid ${tempfile})"]
+	  [div .section .basic $(
+	    edit_item "$card" N GENDER
+	    [ "$(pdi_count "$card" NICKNAME)" -gt 0 ] \
+	    && edit_item "$card" NICKNAME
+	    edit_item "$card" BDAY
+	    edit_item "$card" X-ZACK-JOINDATE
+	    [ "$(pdi_count "$card" X-ZACK-LEAVEDATE)" -gt 0 ] \
+	    && edit_item "$card" X-ZACK-LEAVEDATE
+	    card_item "$card" SOUND PHOTO LOGO
+	  )]
+	  [div .section .phone   $(edit_item "$card" TEL)]
+	  [div .section .message $(
+	    edit_item "$card" EMAIL
+	    [ $(pdi_count "$card" IMPP) -gt 0 ] && edit_item "$card" IMPP
+	    [ $(pdi_count "$card" URL ) -gt 0 ] && edit_item "$card" URL
+	  )]
+	  [div .section .address $(edit_item "$card" ADR)]
+	  [div .section .note    $(edit_item "$card" NOTE)]
+	  [div .section .attendance
+	    [h3 $(l10n course_attendance) ] $(
+	    for course in "$_DATA"/ical/*.ics; do
+	      printf '[label [input type="checkbox" name="attendance" value="%s" %s] %s]' \
+	             "${course##*/}" \
+	             "$(grep -qF "${course##*/}	${cardfile##*/}" "$_DATA/mappings/attendance" \
+	                && printf 'checked="checked"'
+	               )" \
+	             "$(pdi_value "$(pdi_load "$course")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
+	    done)
+	    [h3 $(l10n CATEGORIES) ] $(
+	    grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do
+	      printf '[label [input type="checkbox" name="CATEGORIES" value="%s" %s] %s]' \
+	             "$(HTML "$cat")" \
+	             "$(seq 1 $(pdi_count "$card" CATEGORIES) |while read c; do
+	               pdi_value "$card" CATEGORIES $c |grep -qxF "$cat" \
+	               && printf 'checked="checked"' && break
+	             done)" \
+	             "$(HTML "$cat")"
+	    done)
+	  ]
+	  [div .control
+	    [div .item .delete label="$(l10n edit_delete)"
+              [input type="checkbox" #delete]
+              [label for="delete" $(l10n edit_delete)]
+	      [button type="submit" name="action" value="delete" $(l10n edit_delete)]
+            ]
+            [div .item .newfield
+              [select name="newfield"
+	        [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
+	        $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do
+	          printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
+	        done)
+	      ][button type="submit" name="action" value="addfield" $(l10n edit_addfield)]
+            ]
+	    [button .item type="submit" name="action" value="update"   $(l10n edit_update)]
+	    [button .item type="submit" name="action" value="cancel"   $(l10n edit_cancel)]
+	  ]
+	  [input type="hidden" name="UID" value="$(pdi_value "$card" UID |HTML)"]
+	  [input type="hidden" name="card" value="${cardfile##*/}"]
+	]
 	EOF
-    printf '%s %s %s %s %s' "$n4" "$n2" "$n3" "$n1" "$n5"
-  elif [ "$NICKNAME" ]; then
-    printf '"%s"' "$NICKNAME"
   fi
 }
 
-
-card_item(){
-  local card="$1"
-  local item cnt c
-  shift 1
-
-  for item in $@; do
-    cnt="$(pdi_count "$card" "$item")"
-
-    case $item in
-      FN) printf '[h2 .item .FN &shy;%s]' "$(card_fullname "$card" |unescape |HTML)"
-        ;;
-      GENDER) printf '[span .item .GENDER &shy;%s]' "$(pdi_value "$card" GENDER |l10n)"
-        ;;
-      NICKNAME) seq 1 $cnt |while read c; do
-          printf '[span .item .NICKNAME &shy;aka. "%s"]' \
-                 "$(pdi_value "$card" NICKNAME $c |unescape |HTML)"
-        done
-        ;;
-      X-ZACK-JOINDATE|X-ZACK-LEAVEDATE) if [ $cnt -gt 0 ]; then
-          printf '[span .item .%s [b %s:] %s]' \
-                 "$item" "$(l10n "${item}_short")" \
-                 "$(pdi_value "$card" "$item" |HTML)"
-        fi
-        ;;
-      BDAY) if [ $cnt -gt 0 ]; then
-          printf '[span .item .BDAY [b *:] %s]' \
-                 "$(pdi_value "$card" BDAY |grep -xE '[0-9-]+')"
-        fi
-        ;;
-      SOUND) if [ $cnt -gt 0 ]; then
-          printf '[audio .item .SOUND controls="controls"
-                    [source type="audio/ogg" src="data:audio/ogg;base64,%s"]
-                  ]' \
-                 "$(pdi_value "$card" SOUND |grep -xE '[a-zA-Z0-9/+=]+')"
-        fi
-        ;;
-      PHOTO|LOGO) if [ $cnt -gt 0 ]; then 
-          printf '[img .item .%s src="data:image/%s;base64,%s"]' "$item" \
-                 "$(pdi_attrib "$card" "$item" |sed -E 's;^(.*;)?TYPE="?(.+)"?(;.*)?$;\2;')" \
-                 "$(pdi_value "$card" "$item" |grep -xE '[a-zA-Z0-9/+=]+')"
-        fi
-        ;;
-      EMAIL) if [ $cnt -gt 0 ]; then
-          printf '[h3 %s]' "$(l10n EMAIL)"
-          seq 1 $cnt |while read c; do
-            printf '[a .item .EMAIL href="mailto:%s" &shy;%s]' \
-                   "$(pdi_value "$card" EMAIL $c |unescape |HTML)" \
-                   "$(pdi_value "$card" EMAIL $c |unescape |HTML)"
-          done
-        fi
-        ;;
-      *) if [ $cnt -gt 0 ]; then
-          printf '[h3 %s]' "$(l10n "$item")"
-          seq 1 $cnt |while read c; do
-            printf '[span .item .%s &shy;%s]' "$item" \
-                   "$(pdi_value "$card" "$item" $c |unescape |HTML)"
-          done
-        fi
-        ;;
-    esac
-  done
-}
-
 print_card(){
   local cardfile="$1"
-  local cachefile="${_DATA}/cache/${cardfile##*/}.cache"
-
-  if [ "$cachefile" -nt "$cardfile" -a "$cachefile" -nt "${_EXEC}/cards" ]; then
-    cat "$cachefile"
-  else
-    local card="$(pdi_load "$cardfile")"
-    tee "$cachefile" <<-EOF
+  local card="$(pdi_load "$cardfile")"
+  cat <<-EOF
     [div .card #${cardfile##*/}
-      [div .section .basic &shy;$(
+      [div .section .basic . $(
         card_item "$card" FN GENDER NICKNAME BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE SOUND PHOTO LOGO
       )]
-      [div .section .phone   &shy;$(card_item "$card" TEL)]
-      [div .section .message &shy;$(card_item "$card" EMAIL IMPP URL)]
-      [div .section .address &shy;$(card_item "$card" ADR)]
-      [div .section .note    &shy;$(card_item "$card" NOTE)]
-      [div .section .attendance [h3 $(l10n course_attendance) ] [ul &shy;
+      [div .section .phone   . $(card_item "$card" TEL)]
+      [div .section .message . $(card_item "$card" EMAIL IMPP URL)]
+      [div .section .address . $(card_item "$card" ADR)]
+      [div .section .note    . $(card_item "$card" NOTE)]
+      [div .section .attendance [h3 $(l10n course_attendance) ] [ul
         $(grep -F "	${cardfile##*/}" "$_DATA/mappings/attendance" |while read each discard; do
-          printf '[li [a .item .attendance href="/courses#%s" &shy;%s]]' \
+          printf '[li [a .item .attendance href="/courses#%s" . %s]]' \
                  "$each" \
-                 "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY |unescape |HTML)"
+                 "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
         done)]
         $(card_item "$card" CATEGORIES)
       ]
       [div .control
-        [a .item href="/cards/${cardfile##*/}?action=edit" $(l10n edit)]
-        [a .item href="/cards/${cardfile##*/}?action=export" $(l10n vcf_export)]
+        [a .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
+        [a .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
       ]
     ]
 	EOF
-  fi
+}
+
+print_cards(){
+  local cardfile cachefile date size name ldate=0 lsize lname
+
+  while read cardfile; do
+    cachefile="${_DATA}/cache/${cardfile##*/}.cache"
+    # if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" \
+    #                      -a "$cachefile" -nt "${_EXEC}/cards" ]; then
+    if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" ]; then
+      cat "$cachefile"
+    else
+      print_card "$cardfile" |tee "$cachefile"
+    fi
+  done
 }
 
 filter_cards(){
   local filter f fex='x;p;'
 
   filter="$(printf %s "${filter}" \
-            | sed -E 's;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\\\&;g;
+            | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\\\&;g;
                       '"$upcase"
            )^"
 
@@ -135,13 +134,13 @@ filter_cards(){
     case $f in
       '') break
         ;;
-      ANY:*) fex="/\n.*(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      ANY:*) fex="/\n.*(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      *) fex="/\n${f%%:*}(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      *) fex="/\n${f%%:*}(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
     esac
   done
@@ -150,13 +149,35 @@ filter_cards(){
     printf '%s\n' "$cardfile"
     cat "$cardfile"
   done \
-  | sed -En ':X; /\nEND:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
+  | sed -nE ':X; /\nEND:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
              '"$upcase""$fex"
 }
 
+order_cards() {
+  local cardfile card
+
+  while read cardfile; do
+    card="$(pdi_load "$cardfile")"
+
+    case $order in
+      firstname)
+        printf '%s	%s\n' "$(pdi_value "$card" FN)" "$cardfile"
+        ;;
+      lastname)
+        printf '%s	%s\n' "$(pdi_value "$card" N || pdi_value "$card" FN)" "$cardfile"
+        ;;
+      bdate)
+        printf '%s	%s\n' "$(pdi_value "$card" BDAY || printf 0000-00-00)" "$cardfile"
+        ;;
+    esac
+  done \
+  | sort \
+  | sed -E 's;^.*\t;;g'
+}
+
 list_cards(){
   filter_cards \
-  | while read cardfile; do
-    print_card "$cardfile"
-  done
+  | order_cards \
+  | grep -xvF "$edit" \
+  | print_cards
 }