X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations%2Fhomonymes.inc.php;h=7f181ef217afb405127300e962537a0e220ae4e4;hb=4371e993d51f10d655c4b453563c730b613b490e;hp=5f3e4d8fdcc593224bdfa052de3600fe7fc7530e;hpb=483da16573717c21c7e6da3eacc094048ab7d72f;p=platal.git

diff --git a/include/validations/homonymes.inc.php b/include/validations/homonymes.inc.php
index 5f3e4d8..7f181ef 100644
--- a/include/validations/homonymes.inc.php
+++ b/include/validations/homonymes.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,7 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'validations.inc.php';
 // {{{ class HomonymeReq
 
 class HomonymeReq extends Validate
@@ -32,12 +31,12 @@ class HomonymeReq extends Validate
 
     public $homonymes_hruid;
 
-    public $rules = "Accepter, sauf cas particulier d'utilisateur dont l'homonymie est traité plus ... manuellement";
+    public $rules = "Accepter, sauf cas particulier d'utilisateur dont l'homonymie est traité plus &hellip; manuellement.";
 
     // }}}
     // {{{ constructor
 
-    public function __construct(User &$_user, $_loginbis, $_homonymes_hruid, $warning=true)
+    public function __construct(User $_user, $_loginbis, $_homonymes_hruid, $warning=true)
     {
         $this->warning = $warning;
 
@@ -122,10 +121,24 @@ est ambigu pour des raisons d'homonymie et signalera ton email exact.";
     public function commit()
     {
         Platal::load('admin', 'homonyms.inc.php');
-        switch_bestalias($this->user, $this->loginbis);
         if (!$this->warning) {
-            XDB::execute("UPDATE aliases SET type = 'homonyme', expire = NOW() WHERE alias = {?}", $this->loginbis);
-            XDB::execute("REPLACE INTO homonymes (homonyme_id, user_id) VALUES({?}, {?})", $this->user->id(), $this->user->id());
+            global $globals;
+            require_once 'emails.inc.php';
+
+            XDB::execute('DELETE  e
+                            FROM  email_source_account  AS e
+                      INNER JOIN  email_virtual_domains AS d ON (e.domain = d.id)
+                           WHERE  e.email = {?} AND d.name = {?}',
+                         $this->loginbis, $globals->mail->domain);
+            XDB::execute('INSERT INTO  email_source_other (hrmid, email, domain, type, expire)
+                               SELECT  CONCAT(\'h.\', {?}, \'.\', {?}), {?}, id, \'homonym\', NOW()
+                                 FROM  email_virtual_domains
+                                WHERE  name = {?}',
+                         $this->loginbis, $globals->mail->domain, $this->loginbis, $globals->mail->domain);
+            XDB::execute('INSERT IGNORE INTO  homonyms_list (hrmid, uid)
+                                      VALUES  ({?}, {?})',
+                         'h.' . $this->loginbis . '.' . $globals->mail->domain, $this->user->id());
+            fix_bestalias($this->user);
         }
 
         return true;