multiple logical fixes in vcard updater

[confetti] / templates / edit_attendee.sh

diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index 72824528a164d68e06db7bfbe5b0dd8d12d0c599..679a7bd249fd06644a1bcbc7ad0e2e524a0cbe75 100755 (executable)
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -9,6 +9,8 @@ edit_card() {
   n_pre="$(echo "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')"
   n_post="$(echo "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')"
 
+  [ -z "$values[UID]" ] && values[UID]="$(dbus-uuidgen)"
+
   echo '  <div class="section basic">'
   echo '    <span class="sectitle">'$(l10n N)'</span>'
   echo '    <input class="item N" name="3N" placeholder="'$(l10n n_pre)'" value="'$n_pre'" />'
@@ -90,6 +92,7 @@ edit_card() {
   echo '    <button class="item control" type="submit" name="action" value="update">'$(l10n edit_update)'</button>'
   echo '    <button class="item control" type="submit" name="action" value="cancel">'$(l10n edit_cancel)'</button>'
   echo '  </div>'
+  echo '<input type="hidden" name="UID" value="'$values[UID]'"/>'
 }
 
 edit_attendee() {  #Parameter: Cardfile
@@ -108,7 +111,7 @@ edit_attendee() {  #Parameter: Cardfile
         if [ -z "$key" ]; then
           eval "$line"
         else
-          values[$key]="$value"
+         [ -n "$value" ] && values[$key]="$value" || values[$key]='\r'
           for t in ${(k)tag}; do
             tags[${key}_$t]="$tag[$t]"
           done