X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fname.func.inc.php;h=8ac831de039255739b9746ebc79dde6fd82a74b8;hb=73b2b930263ff19715540307aba38a7981f3cecf;hp=d3d11a2070fa17735de23c47da750aa698bbc30a;hpb=c0436d0bd05bbaf2b3140d2a56c7f538d52bf0e6;p=platal.git

diff --git a/include/name.func.inc.php b/include/name.func.inc.php
index d3d11a2..8ac831d 100644
--- a/include/name.func.inc.php
+++ b/include/name.func.inc.php
@@ -247,17 +247,22 @@ function compare_basename($a, $b) {
     return name_to_basename($a) == name_to_basename($b);
 }
 
-function set_alias_names(&$sn_new, $sn_old, $pid, $uid, $update_new = false, $new_alias = null)
+function set_alias_names(&$sn_new, $sn_old, $pid, PlUser $user, $update_new = false, $new_alias = null)
 {
     $has_new = false;
     foreach ($sn_new as $typeid => $sn) {
-        if (isset($sn['pub'])) {
+        if (isset($sn['pub']) && !is_null($sn['fullname'])) {
             if (isset($sn_old[$typeid]) && $update_new) {
                 XDB::execute("UPDATE  profile_name
                                  SET  particle = {?}, name = {?}, typeid = {?}
                                WHERE  id = {?} AND pid = {?}",
                              $sn['particle'], $sn['name'], $typeid, $sn_old[$typeid]['id'], $pid);
                 unset($sn_old[$typeid]);
+            } elseif ($sn['fullname'] == $sn_old[$typeid]['fullname'] && $sn['name'] == $sn_old[$typeid]['name']) {
+                XDB::execute('INSERT INTO  profile_name (particle, name, typeid, pid)
+                                   VALUES  ({?}, {?}, {?}, {?})',
+                             $sn_old[$typeid]['particle'], $sn_old[$typeid]['name'], $typeid, $pid);
+                unset($sn_old[$typeid]);
             } else {
                 $has_new = true;
             }
@@ -293,18 +298,16 @@ function set_alias_names(&$sn_new, $sn_old, $pid, $uid, $update_new = false, $ne
         }
     }
     if ($update_new) {
-        XDB::execute('DELETE  s
-                        FROM  email_source_account  AS s
-                  INNER JOIN  email_virtual_domains AS d ON (s.domain = d.id)
-                       WHERE  FIND_IN_SET(\'usage\', s.flags) AND s.uid = {?} AND d.name = {?}',
-                     $uid, Platal::globals()->mail->domain);
+        XDB::execute('DELETE FROM  email_source_account
+                            WHERE  FIND_IN_SET(\'usage\', flags) AND uid = {?} AND type = \'alias\'',
+                     $user->id());
     }
     if ($new_alias) {
         XDB::execute('INSERT INTO  email_source_account (email, uid, type, flags, domain)
                            SELECT  {?}, {?}, \'alias\', \'usage\', id
                              FROM  email_virtual_domains
                             WHERE  name = {?}',
-                     $new_alias, $uid, Platal::globals()->mail->domain);
+                     $new_alias, $user->id(), $user->mainEmailDomain());
     }
     Profile::rebuildSearchTokens($pid, false);
     return $has_new;