X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fview_attendee.sh;h=5966729e01611df62bb78485d186cf8ecefd1b0d;hp=e1b6530b49406a224763e1460128dd1a8b23d1b2;hb=70c5786a6b3dd9c6561e2f19f2827ce92191c13f;hpb=69e661b5c8ec195bd3c4998a623a60607b47059e

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index e1b6530..5966729 100755
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -15,9 +15,14 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
+n=$(printf %s "$values[N+3] $values[N+1] $values[N+2] $values[N+0] $values[N+4]" \
+    | sed -r ':X;$!{N;bX}; s;^[\n ]+;;; s;[\n ]+$;;; s;[\r\t\n ]+; ;g;'
+   )
+fullname="${n:-${values[FN]:-${values[NICKNAME]}}}"
+
 cat <<END_HTML
   <div class="section basic">
-    <h2 class="item FN">$values[FN]</h2>
+    <h2 class="item FN">$fullname</h2>
     ${values[GENDER]:+<span class="item GENDER">$(l10n $values[GENDER])</span>}
 
     $(for n in NICKNAME NICKNAME{0..10}; do
@@ -28,14 +33,14 @@ cat <<END_HTML
     ${values[X-ZACK-JOINDATE]:+<span class="item X-ZACK-JOINDATE"><b>$(l10n label_join):</b> $values[X-ZACK-JOINDATE]</span>}
     ${values[X-ZACK-LEAVEDATE]:+<span class="item X-ZACK-LEAVEDATE"><b>$(l10n label_leave):</b> $values[X-ZACK-LEAVEDATE]</span>}
     ${values[SOUND]:+<audio controls="controls" class="item SOUND"><source type="audio/ogg" src="data:audio/ogg;base64,$values[SOUND]" /></audio>}
-    ${values[PHOTO]:+<img class="item PHOTO" src="data:image/$tags[PHOTO_TYPE];base64,$values[PHOTO]" />}
-    ${values[LOGO]:+<img class="item LOGO" src="data:image/$tags[LOGO_TYPE];base64,$values[LOGO]" />}
+    ${values[PHOTO]:+<img class="item PHOTO" src="data:image/$values[PHOTO_TYPE];base64,$values[PHOTO]" />}
+    ${values[LOGO]:+<img class="item LOGO" src="data:image/$values[LOGO_TYPE];base64,$values[LOGO]" />}
   </div><!--
 
   --><div class="section phone">
     <h3>$(l10n TEL)</h3>
     $(for n in TEL TEL{0..10}; do
-      echo "${values[$n]:+<span class="item TEL">$tags[${n}_TYPE] $values[$n]</span>}"
+      echo "${values[$n]:+<span class="item TEL">$values[${n}_TYPE] $values[$n]</span>}"
     done)
   </div><!--
 
@@ -46,7 +51,7 @@ cat <<END_HTML
     done)
     ${values[IMPP]:+<h3>$(l10n IMPP)</h3>}
     $(for n in IMPP IMPP{0..10}; do
-      echo "${values[$n]:+<span class="item IMPP">$tags[${n}_TYPE] <a href="$values[$n]">$values[$n]</a></span>}"
+      echo "${values[$n]:+<span class="item IMPP">$values[${n}_TYPE] <a href="$values[$n]">$values[$n]</a></span>}"
     done)
   </div><!--