X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Femails%2Fsend.tpl;h=4e9b0d3bfda4a15f8f84d7be51198b6339c50837;hb=8425f487a974708f1ee5b186edbfbf1e7dae4a35;hp=26ae04d8a1be0b2e633c6382f648e56095181d79;hpb=8d84c630f353ef0534e02325507ed35cc2f0d28f;p=platal.git

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 26ae04d..4e9b0d3 100644
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -156,7 +156,7 @@
 
 <p>
   <small>{icon name=information title="Envoi d'email"} Pour envoyer un email, tu peux soit le faire depuis l'interface
-  ci-dessous, soit utiliser <a href="Xorg/SMTPSecurise">notre serveur d'envoi SMTP<a>.</small>
+  ci-dessous, soit utiliser <a href="Xorg/SMTPSecurise">notre serveur d'envoi SMTP</a>.</small>
 </p>
 
 <form action="emails/send" method="post" enctype="multipart/form-data" id="form_mail" onsubmit="return check(this);">
@@ -211,18 +211,18 @@
         <div style="float: right; width: 40%;">
           <select id="to_contacts" name="to_contacts[]" multiple="multiple" style="width: 100%; height: 5em">
           {foreach key=key item=contact from=$contacts}
-          {if in_array($contact.forlife, $smarty.request.to_contacts)}
-          <option value="{$contact.forlife}">
-            {$contact.prenom} {$contact.nom} (X{$contact.promo})
+          {if in_array($contact->hruid,$smarty.request.to_contacts)}
+          <option value="{$contact->hruid}">
+            {$contact->full_name}
           </option>
           {/if}
           {/foreach}
           </select><br />
           <select id="cc_contacts" name="cc_contacts[]" multiple="multiple" style="width: 100%; height: 5em">
           {foreach key=key item=contact from=$contacts}
-          {if in_array($contact.forlife, $smarty.request.cc_contacts)}
-          <option value="{$contact.forlife}">
-            {$contact.prenom} {$contact.nom} (X{$contact.promo})
+          {if in_array($contact->forlife,$smarty.request.cc_contacts)}
+          <option value="{$contact->forlife}">
+            {$contact->full_name}
           </option>
           {/if}
           {/foreach}
@@ -243,16 +243,16 @@
         <div style="float: right; width: 40%">
           <select id="contacts" name="all_contacts[]" multiple="multiple" style="height: 10em; width: 100%">
             {foreach item=contact from=$contacts}
-            {if !in_array($contact.forlife, $smarty.request.to_contacts) && !in_array($contact.forlife, $smarty.request.cc_contacts)}
-            <option value="{$contact.forlife}">
-              {$contact.prenom} {$contact.nom} (X{$contact.promo})
+            {if !in_array($contact->hruid,$smarty.request.to_contacts) && !in_array($contact->hruid,$smarty.request.cc_contacts)}
+            <option value="{$contact->hruid}">
+              {$contact->full_name}
             </option>
             {/if}
             {/foreach}
           </select>
         </div>
         {foreach item=contact from=$contacts}
-        <input type="hidden" name="contacts[{$contact.forlife}]" value="{$contact.prenom} {$contact.nom} &lt;{$contact.forlife}@{#globals.mail.domain#}&gt;" />
+        <input type="hidden" name="contacts[{$contact->hruid}]" value="{$contact->display_name} &lt;{$contact->forlife}&gt;" />
         {/foreach}
       </td>
     </tr>
@@ -283,7 +283,7 @@
 {$smarty.request.contenu}
 {if !$smarty.request.contenu}
 -- 
-{$smarty.session.prenom} {$smarty.session.nom}
+{$smarty.session.user->full_name}
 {/if}</textarea>
     <script type="text/javascript">//<![CDATA[
       {literal}