Remove duplicated code for checking a list of login

[platal.git] / templates / vcard.tpl

diff --git a/templates/vcard.tpl b/templates/vcard.tpl
index 3350703..8f5b626 100644 (file)
--- a/templates/vcard.tpl
+++ b/templates/vcard.tpl
@@ -27,6 +27,9 @@ FN;ENCODING=QUOTED-PRINTABLE:{"`$vcard.prenom` `$vcard.nom_usage` (`$vcard.nom`)
 FN;ENCODING=QUOTED-PRINTABLE:{"`$vcard.prenom` `$vcard.nom`"|qp_enc}
 {/if}
 N;ENCODING=QUOTED-PRINTABLE:{$vcard.nom|qp_enc};{$vcard.prenom|qp_enc};{$vcard.nom_usage|qp_enc};;
+{if $vcard.nickname}
+NICKNAME;ENCODING=QUOTED-PRINTABLE:{$vcard.nickname}
+{/if}
 EMAIL;TYPE=internet:{$vcard.bestalias}@{#globals.mail.domain#}
 {if $vcard.bestalias neq $vcard.forlife}
 EMAIL;TYPE=internet:{$vcard.forlife}@{#globals.mail.domain#}
@@ -66,7 +69,14 @@ ADR;TYPE=home{if $adr.courier},postal{/if};ENCODING=QUOTED-PRINTABLE:{format_adr
 {if $vcard.web}
 URL;ENCODING=QUOTED-PRINTABLE:{$vcard.web|qp_enc}
 {/if}
-NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)\n`$vcard.libre`"|qp_enc}
+{if strlen(trim($vcard.freetext)) == 0}
+NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)"|qp_enc}
+{else}
+NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)\n`$vcard.freetext`"|qp_enc}
+{/if}
+{if $vcard.photo}
+PHOTO;BASE64:{$vcard.photo|base64_encode}
+{/if}
 SORT-STRING;ENCODING=QUOTED-PRINTABLE:{$vcard.nom|qp_enc}
 REV:{$vcard.date|date_format:"%Y%m%dT000000Z"}
 END:VCARD