X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Flist.sh;h=4a57bd2314f300585b6ef50eb6f9162536898945;hp=a7d39e2880114ff48f5fdbfa62876631b70d7c6f;hb=444462594b41e81946546c1376ef1c06e0c414f8;hpb=34b3497da9c494534e97f46ff8da4986700f6c92

diff --git a/cards/list.sh b/cards/list.sh
index a7d39e2..4a57bd2 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -121,7 +121,7 @@ edit_item(){
         "$([ "$(pdi_value "$card" GENDER)" = 'none' ] && printf 'selected="selected"')" \
         "$(l10n gender_none)"
         ;;
-      BDAY|X-ZACK-JOIDATE|X-ZACK-LEAVEDATE)
+      BDAY|X-ZACK-JOINDATE|X-ZACK-LEAVEDATE)
         printf '[h3 %s]
         [input .item .%s name="%s" value="%s" placeholder="YYYY-MM-DD"]
         ' \
@@ -146,76 +146,80 @@ edit_item(){
 
 edit_card(){
   local cardfile="$_DATA/vcard/$1" 
-  local card="$(pdi_load "$cardfile")"
+  local tempfile card
 
-  cat <<-EOF
-  [form .card #${cardfile##*/} action="/cards/update_card.sh" method="POST"
-    [div .section .basic $(
-      edit_item "$card" N GENDER
-      [ "$(pdi_count "$card" NICKNAME)" -gt 0 ] \
-      && edit_item "$card" NICKNAME
-      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 |unescape |HTML)"
-      done)
-      [h3 $(l10n CATEGORIES) ] $(
-      grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do
-        printf '[label [input type="checkbox" name="attendance" 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
-      [select .item name="newfield"
-        [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
-        $(for f in ; do
-          printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
-        done)
-      ]
-      [button .item type="submit" name="action" value="addfield" $(l10n edit_addfield)]
-      [button .item type="submit" name="action" value="update"   $(l10n edit_update)]
-      [input type="checkbox" #delete] [label .item for="delete" $(l10n edit_delete)]
-        [button .item type="submit" name="action" value="delete"]
-      [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##*/}"]
-  ]
+  . $_EXEC/session_lock.sh
+
+  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 |unescape |HTML)"
+	    done)
+	    [h3 $(l10n CATEGORIES) ] $(
+	    grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do
+	      printf '[label [input type="checkbox" name="attendance" 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
+	    [select .item name="newfield"
+	      [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
+	      $(for f in ; do
+	        printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
+	      done)
+	    ]
+	    [button .item type="submit" name="action" value="addfield" $(l10n edit_addfield)]
+	    [button .item type="submit" name="action" value="update"   $(l10n edit_update)]
+	    [input type="checkbox" #delete] [label .item for="delete" $(l10n edit_delete)]
+	      [button .item type="submit" name="action" value="delete"]
+	    [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
+  fi
 }
 
 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;$(
         card_item "$card" FN GENDER NICKNAME BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE SOUND PHOTO LOGO
@@ -233,12 +237,25 @@ print_card(){
         $(card_item "$card" CATEGORIES)
       ]
       [div .control
-        [a .item href="/cards/?e=${cardfile##*/}" $(l10n edit)]
+        [a .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
         [a .item href="/cards/?x=${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
+      cat "$cachefile"
+    else
+      print_card "$cardfile" |tee "$cachefile"
+    fi
+  done
 }
 
 filter_cards(){
@@ -299,7 +316,5 @@ list_cards(){
   filter_cards \
   | order_cards \
   | grep -xvF "$edit" \
-  | while read cardfile; do
-    print_card "$cardfile"
-  done
+  | print_cards
 }