X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Femails.inc.php;h=2cf14d8c16ddb6256decbf34ab9aab5eb3373bfe;hb=3796392e46bb793fcdbf6c67e4217f86355edcf0;hp=bd24d3ead5bccd6e28aeb301974d52288285e48d;hpb=f4dda5fb49dc3ca77c5d4769c78f131683a2dfd4;p=platal.git

diff --git a/include/emails.inc.php b/include/emails.inc.php
index bd24d3e..2cf14d8 100644
--- a/include/emails.inc.php
+++ b/include/emails.inc.php
@@ -30,7 +30,20 @@ function require_email_update(User $user, $new_email)
 {
     Platal::assert(!is_null($user), 'User cannot be null.');
 
-    return !$user->checkPerms(User::PERM_MAIL) && strtolower($new_email) != strtolower($user->forlifeEmail());
+    $is_new = !$user->checkPerms(User::PERM_MAIL) && $new_email != strtolower($user->email);
+    if ($new_email && $is_new) {
+        $already = XDB::fetchOneCell('SELECT  hruid
+                                        FROM  accounts
+                                       WHERE  email = {?} AND uid != {?}',
+                                     $new_email, $user->id());
+        if ($already) {
+            Platal::page()->trigError("L'email ne peut pas être utilisé pour ce compte car il correspond déjà au compte : "
+                                      . $already . ". Si l'utilisateur courant et cette personne ne sont en fait qu'une "
+                                      . "seul et même personne, ou en cas de problème, contacter : contact@polytechnique.org");
+            return false;
+        }
+    }
+    return $is_new;
 }
 
 function format_email_alias($email)
@@ -803,6 +816,9 @@ class Redirect
         XDB::execute('REPLACE INTO  email_redirect_account (uid, redirect, flags, action)
                             VALUES  ({?}, {?}, \'active\', {?})',
                      $this->user->id(), $email, $filter);
+        $listClient = new MMList(S::user());
+        $listClient->change_user_email($this->user->forlifeEmail(), $new_email);
+        update_alias_user($this->user->forlifeEmail(), $new_email);
         if ($logger = S::v('log', null)) { // may be absent --> step4.php
             S::logger()->log('email_add', $email . ($this->user->id() != S::v('uid') ? " (admin on {$this->user->login()})" : ""));
         }