Fix error while requesting an invalid alias.

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index 0b46793..cca8797 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -131,6 +131,9 @@ class EmailModule extends PLModule
         // Fetch existing @alias_dom aliases.
         $alias = $user->emailAlias();
         $visibility = $user->hasProfile() && $user->profile()->alias_pub;
+        $page->assign('actuel', $alias);
+        $page->assign('user', $user);
+        $page->assign('mail_public', $visibility);
 
         if ($action == 'ask' && Env::has('alias') && Env::has('raison')) {
             S::assert_xsrf_token();
@@ -393,10 +396,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 +484,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());