X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fvcard.tpl;h=302dc0c073f790279096f7729e7f80422b181cc4;hb=4847ce1794ebcc2d6e0568844a5629b972ace0da;hp=188599ed7a7f6dc3b8dfdac434bba6c8a9958494;hpb=79a5acea67d00315fe79f2daad4568cd4d423235;p=platal.git

diff --git a/templates/vcard.tpl b/templates/vcard.tpl
index 188599e..302dc0c 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  *}
@@ -19,55 +19,76 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
+{foreach from="$users" item=vcard}
 BEGIN:VCARD
 VERSION:3.0
 {if $vcard.nom_usage}
-FN;ENCODING=QUOTED-PRINTABLE:{"`$vcard.prenom` `$vcard.nom_usage` (`$vcard.nom`)"|qp_enc}
+FN:{$vcard.prenom|vcard_enc} {$vcard.nom_usage|vcard_enc} ({$vcard.nom|vcard_enc})
 {else}
-FN;ENCODING=QUOTED-PRINTABLE:{"`$vcard.prenom` `$vcard.nom`"|qp_enc}
+FN:{$vcard.prenom|vcard_enc} {$vcard.nom|vcard_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
+N:{$vcard.nom|vcard_enc};{$vcard.prenom|vcard_enc};{$vcard.nom_usage|vcard_enc};;
+{if $vcard.nickname}
+NICKNAME:{$vcard.nickname|vcard_enc}
+{/if}
+EMAIL;TYPE=internet,pref:{$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}
 {/if}
 {if $vcard.mobile}
-TEL;TYPE=cell;ENCODING=QUOTED-PRINTABLE:{$vcard.mobile|qp_enc}
+TEL;TYPE=cell:{$vcard.mobile|vcard_enc}
 {/if}
 {if $vcard.adr_pro}
 {if $vcard.adr_pro[0].entreprise}
-ORG;ENCODING=QUOTED-PRINTABLE:{$vcard.adr_pro[0].entreprise|qp_enc}
+ORG:{$vcard.adr_pro[0].entreprise|vcard_enc}
 {/if}
 {if $vcard.adr_pro[0].poste}
-TITLE;ENCODING=QUOTED-PRINTABLE:{$vcard.adr_pro[0].poste|qp_enc}
+TITLE:{$vcard.adr_pro[0].poste|vcard_enc}
 {/if}
 {if $vcard.adr_pro[0].fonction}
-ROLE;ENCODING=QUOTED-PRINTABLE:{$vcard.adr_pro[0].fonction|qp_enc}
+ROLE:{$vcard.adr_pro[0].fonction|vcard_enc}
 {/if}
 {if $vcard.adr_pro[0].tel}
-TEL;TYPE=work;ENCODING=QUOTED-PRINTABLE:{$vcard.adr_pro[0].tel|qp_enc}
+TEL;TYPE=work:{$vcard.adr_pro[0].tel|vcard_enc}
 {/if}
 {if $vcard.adr_pro[0].fax}
-FAX;TYPE=work;ENCODING=QUOTED-PRINTABLE:{$vcard.adr_pro[0].fax|qp_enc}
+FAX;TYPE=work:{$vcard.adr_pro[0].fax|vcard_enc}
 {/if}
-ADR;TYPE=work;ENCODING=QUOTED-PRINTABLE:{format_adr adr=$vcard.adr_pro[0]}
+ADR;TYPE=work:{format_adr adr=$vcard.adr_pro[0]}
 {/if}
 {foreach item=adr from=$vcard.adr}
-ADR;TYPE=home{if $adr.courier},postal{/if};ENCODING=QUOTED-PRINTABLE:{format_adr adr=$adr}
+ADR;TYPE=home{if $adr.courier},postal{/if}:{format_adr adr=$adr}
 {foreach item=tel from=$adr.tels}
 {if $tel.tel}
-{if $tel.tel_type neq 'Fax'}TEL{else}FAX{/if};TYPE=home;ENCODING=QUOTED-PRINTABLE:{$tel.tel|qp_enc}
+{if $tel.tel_type neq 'Fax'}TEL{else}FAX{/if};TYPE=home:{$tel.tel}
 {/if}
 {/foreach}
 {/foreach}
 {if $vcard.web}
-URL;ENCODING=QUOTED-PRINTABLE:{$vcard.web|qp_enc}
+URL:{$vcard.web}
+{/if}
+{if strlen(trim($vcard.freetext)) == 0}
+NOTE:(X{$vcard.promo})
+{else}
+NOTE:(X{$vcard.promo})\n{$vcard.freetext|vcard_enc}
+{/if}
+{if $vcard.section}
+X-SECTION:{$vcard.section}
 {/if}
-NOTE;ENCODING=QUOTED-PRINTABLE:{"(X`$vcard.promo`)\n`$vcard.libre`"|qp_enc}
-SORT-STRING;ENCODING=QUOTED-PRINTABLE:{$vcard.nom|qp_enc}
+{if $vcard.binets_vcardjoin}
+X-BINETS:{$vcard.binets_vcardjoin}
+{/if}
+{if $vcard.gpxs_vcardjoin}
+X-GROUPS:{$vcard.gpxs_vcardjoin}
+{/if}
+{if $vcard.photo}
+PHOTO;ENCODING=b;TYPE={$vcard.photo.attachmime}:{$vcard.photo.attach|base64_encode}
+{/if}
+SORT-STRING:{$vcard.nom|vcard_enc}
 REV:{$vcard.date|date_format:"%Y%m%dT000000Z"}
-END:VCARD
+END:VCARD{"\n"}
+{/foreach}
 {* vim:set et sw=2 sts=2 sws=2: *}