X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fxnetevents%2Fcalendar.tpl;h=c42708c299143b77ed40d0af051ff4b873d5078c;hb=HEAD;hp=fe5a3d3ecda49cf666773ab0ad3da36e3f50d65a;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/templates/xnetevents/calendar.tpl b/templates/xnetevents/calendar.tpl
index fe5a3d3..c42708c 100644
--- a/templates/xnetevents/calendar.tpl
+++ b/templates/xnetevents/calendar.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2014 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -25,20 +25,16 @@ VERSION:2.0
 CALSCALE:GREGORIAN
 X-WR-TIMEZONE:Europe/Paris
 METHOD:PUBLISH
-{display_ical name="x-wr-calname" value=$asso.nom}
+{display_ical name="x-wr-calname" value=$asso->nom}
 BEGIN:VEVENT
 DSTAMP:{$timestamp|date_format:"%Y%m%dT%H%M%SZ"}
 DTSTART;VALUE=DATE;TZID=Europe/Paris:{$e.debut}
 DTEND;VALUE=DATE;TZID=Europe/Paris:{$e.fin}
-ORGANIZER;CN="{$e.prenom|utf8_encode} {$e.nom|utf8_encode}":MAILTO:{$e.alias}@polytechnique.org
-UID:event-{$e.short_name}-{$e.eid}@{$asso.diminutif}.polytechnique.org
+ORGANIZER;CN="{$e.prenom} {$e.nom}":MAILTO:{$e.alias}@polytechnique.org
+UID:event-{$e.short_name}-{$e.eid}@{$asso->diminutif}.polytechnique.org
 {if $admin}
 {foreach from=$participants item=m}
-{if $m.x}
-ATTENDEE;CN="{$m.prenom|utf8_encode} {$m.nom|utf8_encode} (X{$m.promo})":MAILTO:{$m.email}@{#globals.mail.domain#}
-{else}
-ATTENDEE;CN="{$m.prenom|utf8_encode} {$m.nom|utf8_encode} (non-X)":MAILTO:{$m.email}
-{/if}
+ATTENDEE;CN="{$m.user->fullName('promo')}":MAILTO:{$m.user->bestEmail()}
 {/foreach}
 {/if}
 {if $e.accept_nonmembre}
@@ -50,4 +46,4 @@ CLASS:PRIVATE
 {display_ical name="description" value=$e.descriptif}
 END:VEVENT
 END:VCALENDAR
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
+{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *}