X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fvcard.tpl;h=930367a199519177e0b698f826a1a5c2936ece2e;hb=f27c9a007ca453a31e8c7857c10c5b0f963bdf04;hp=188599ed7a7f6dc3b8dfdac434bba6c8a9958494;hpb=79a5acea67d00315fe79f2daad4568cd4d423235;p=platal.git

diff --git a/templates/vcard.tpl b/templates/vcard.tpl
index 188599e..930367a 100644
--- a/templates/vcard.tpl
+++ b/templates/vcard.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2004 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -27,9 +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};;
-EMAIL;TYPE=internet:{$vcard.bestalias}@polytechnique.org
+EMAIL;TYPE=internet:{$vcard.bestalias}@{#globals.mail.domain#}
 {if $vcard.bestalias neq $vcard.forlife}
-EMAIL;TYPE=internet:{$vcard.forlife}@polytechnique.org
+EMAIL;TYPE=internet:{$vcard.forlife}@{#globals.mail.domain#}
 {/if}
 {if $vcard.virtualalias}
 EMAIL;TYPE=internet:{$vcard.virtualalias}
@@ -66,7 +66,11 @@ 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}
+{if strlen(trim($vcard.libre)) == 0}
+NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)"|qp_enc}
+{else}
 NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)\n`$vcard.libre`"|qp_enc}
+{/if}
 SORT-STRING;ENCODING=QUOTED-PRINTABLE:{$vcard.nom|qp_enc}
 REV:{$vcard.date|date_format:"%Y%m%dT000000Z"}
 END:VCARD