Merge branch 'xorg/1.0.2/master' into xorg/master

[platal.git] / templates / xnetevents / calendar.tpl

diff --git a/templates/xnetevents/calendar.tpl b/templates/xnetevents/calendar.tpl
index ce7ac73..c40815f 100644 (file)
--- a/templates/xnetevents/calendar.tpl
+++ b/templates/xnetevents/calendar.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -25,19 +25,19 @@ 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#}
+ATTENDEE;CN="{$m.prenom} {$m.nom} (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}
+ATTENDEE;CN="{$m.prenom} {$m.nom} (non-X)":MAILTO:{$m.email}
 {/if}
 {/foreach}
 {/if}
@@ -50,3 +50,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: *}