X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.combobox.inc.php;h=3409e7ad505dabdfd29f609a18f93c8a764f2c84;hb=8231a8595422f734d315d64ce36fef0dbebc0abf;hp=546063bbe64640a409e03481dacaa9f3a55242c2;hpb=353f2d2b11c4e3c6c0bc3553813368b6f42fa9c6;p=platal.git

diff --git a/include/emails.combobox.inc.php b/include/emails.combobox.inc.php
index 546063b..3409e7a 100644
--- a/include/emails.combobox.inc.php
+++ b/include/emails.combobox.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,53 +19,47 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-function fill_email_combobox(PlPage& $page, $user = null, $profile = null)
+function fill_email_combobox(PlPage $page, $user = null, $profile = null)
 {
-    global $globals;
-
-    if (is_null($user) && is_null($profile)) {
+    if (is_null($user)) {
         $user = S::user();
-        $profile = $user->profile();
     }
-    $email_type = "directory";
+    if (is_null($profile)) {
+        /* Always refetch the profile. */
+        $profile = $user->profile(true);
+    }
+    $email_type = 'directory';
 
     if ($profile) {
-        $res = XDB::query(
-                "SELECT  email_directory
-                   FROM  profile_directory
-                  WHERE  uid = {?}", $profile->id());
-        $email_directory = $res->fetchOneCell();
-        if ($email_directory) {
-            $page->assign('email_directory', $email_directory);
-            list($alias, $domain) = explode('@', $email_directory);
-        } else {
-            $page->assign('email_directory', '');
-            $email_type = NULL;
-            $alias = $domain = '';
-        }
-    }
+        $email_directory = $profile->email_directory;
+        $page->assign('email_directory', $email_directory);
 
-    if ($user) {
-        $melix = $user->emailAlias();
-        if ($melix) {
-            list($melix) = explode('@', $melix);
-            $page->assign('melix', $melix);
-            if (($domain == $globals->mail->alias_dom) || ($domain == $globals->mail->alias_dom2)) {
-                $email_type = "melix";
+        $res = XDB::fetchAllAssoc('SELECT  email
+                                     FROM  profile_job
+                                    WHERE  pid = {?}', $profile->id());
+        $pro = array();
+        foreach ($res as $res_it) {
+            if ($res_it['email'] != '') {
+                $pro[] = $res_it['email'];
+                if ($email_directory == $res_it['email']) {
+                    $email_type = "pro";
+                }
             }
         }
+        $page->assign('list_email_pro', $pro);
+    }
 
-        $res = XDB::query(
-                "SELECT  alias
-                   FROM  aliases
-                  WHERE  id={?} AND (type='a_vie' OR type='alias')", $user->id());
-        $res = $res->fetchAllAssoc();
+    if ($user) {
+        $res = XDB::fetchAllAssoc('SELECT  CONCAT(s.email, \'@\', d.name) AS email
+                                     FROM  email_source_account  AS s
+                               INNER JOIN  email_virtual_domains AS m ON (s.domain = m.id)
+                               INNER JOIN  email_virtual_domains AS d ON (d.aliasing = m.id)
+                                    WHERE  s.uid = {?}
+                                 ORDER BY  s.email, d.name', $user->id());
         $page->assign('list_email_X', $res);
-        if (($domain == $globals->mail->domain) || ($domain == $globals->mail->domain2)) {
-            foreach ($res as $res_it) {
-                if ($alias == $res_it['alias']) {
-                    $email_type = "X";
-                }
+        foreach ($res as $res_it) {
+            if ($email_directory == $res_it) {
+                $email_type = 'X';
             }
         }
 
@@ -73,32 +67,15 @@ function fill_email_combobox(PlPage& $page, $user = null, $profile = null)
         $redirect = new Redirect($user);
         $redir    = array();
         foreach ($redirect->emails as $redirect_it) {
-            if ($redirect_it instanceof EmailRedirection) {
+            if ($redirect_it->is_redirection()) {
                 $redir[] = $redirect_it->email;
                 if ($email_directory == $redirect_it->email) {
-                    $email_type = "redir";
+                    $email_type = 'redir';
                 }
             }
         }
         $page->assign('list_email_redir', $redir);
-
-        $res = XDB::query(
-                "SELECT  email
-                   FROM  profile_job
-                  WHERE  uid = {?}", $user->id());
-        $res = $res->fetchAllAssoc();
-        $pro = array();
-        foreach ($res as $res_it) {
-            if ($res_it['email'] != '') {
-                $pro[] = $res_it['email'];
-                if ($email_directory == $res_it['email']) {
-                    $email_type = "pro";
-                }
-            }
-        }
-        $page->assign('list_email_pro', $pro);
         $page->assign('email_type', $email_type);
-
     } else {
         $page->assign('list_email_X', array());
         $page->assign('list_email_redir', array());