Cleanup and fix email/send.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/modules/email.php b/modules/email.php
index 0b46793..f7cedd5 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -393,10 +393,11 @@ class EmailModule extends PLModule
                 if (!is_array($aliases)) {
                     return null;
                 }
-                $rel = Env::v('contacts');
+                $uf = new UserFilter(new UFC_Hrpid($aliases));
+                $users = $uf->iterUsers();
                 $ret = array();
-                foreach ($aliases as $alias) {
-                    $ret[$alias] = $rel[$alias];
+                while ($user = $users->next()) {
+                    $ret[] = $user->forlife;
                 }
                 return join(', ', $ret);
             }
@@ -480,7 +481,10 @@ class EmailModule extends PLModule
             }
         }
 
-        $contacts = S::user()->getContacts();
+        $uf = new UserFilter(new PFC_And(new UFC_Contact(S::user()),
+                                         new UFC_Registered()),
+                             UserFilter::sortByName());
+        $contacts = $uf->getProfiles();
         $page->assign('contacts', $contacts);
         $page->assign('maxsize', ini_get('upload_max_filesize') . 'o');
         $page->assign('user', S::user());

diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index fdc69bb..75b0d67 100644 (file)
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -251,9 +251,6 @@
             {/foreach}
           </select>
         </div>
-        {foreach item=contact from=$contacts}
-        <input type="hidden" name="contacts[{$contact->hrpid}]" value="{$contact->display_name} &lt;{$contact->owner()->forlife}&gt;" />
-        {/foreach}
       </td>
     </tr>
     {/if}