Introduces email type alias_aux for emails in auxiliary domains.
[platal.git] / classes / user.php
index 83d7b0a..8b4160b 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
 
 class User extends PlUser
 {
+    const PERM_API_USER_READONLY = 'api_user_readonly';
+    const PERM_DIRECTORY_AX      = 'directory_ax';
+    const PERM_DIRECTORY_PRIVATE = 'directory_private';
+    const PERM_EDIT_DIRECTORY    = 'edit_directory';
+    const PERM_FORUMS            = 'forums';
+    const PERM_GROUPS            = 'groups';
+    const PERM_LISTS             = 'lists';
+    const PERM_MAIL              = 'mail';
+    const PERM_PAYMENT           = 'payment';
+
     private $_profile_fetched = false;
     private $_profile = null;
 
@@ -37,7 +47,7 @@ class User extends PlUser
         }
 
         if ($login instanceof User) {
-            $machin->id();
+            return $login->id();
         }
 
         if ($login instanceof Profile) {
@@ -55,9 +65,9 @@ class User extends PlUser
 
         // If $data is an integer, fetches directly the result.
         if (is_numeric($login)) {
-            $res = XDB::query('SELECT  a.uid
-                                 FROM  accounts AS a
-                                WHERE  a.uid = {?}', $login);
+            $res = XDB::query('SELECT  uid
+                                 FROM  accounts
+                                WHERE  uid = {?}', $login);
             if ($res->numRows()) {
                 return $res->fetchOneCell();
             }
@@ -66,9 +76,9 @@ class User extends PlUser
         }
 
         // Checks whether $login is a valid hruid or not.
-        $res = XDB::query('SELECT  a.uid
-                             FROM  accounts AS a
-                            WHERE  a.hruid = {?}', $login);
+        $res = XDB::query('SELECT  uid
+                             FROM  accounts
+                            WHERE  hruid = {?}', $login);
         if ($res->numRows()) {
             return $res->fetchOneCell();
         }
@@ -77,68 +87,35 @@ class User extends PlUser
         // If it doesn't look like a valid address, appends the plat/al's main domain.
         $login = trim(strtolower($login));
         if (strstr($login, '@') === false) {
-            $login = $login . '@' . $globals->mail->domain;
-        }
-
-        // Checks if $login is a valid alias on the main domains.
-        list($mbox, $fqdn) = explode('@', $login);
-        if ($fqdn == $globals->mail->domain || $fqdn == $globals->mail->domain2) {
-            $res = XDB::query('SELECT  a.uid
-                                 FROM  accounts AS a
-                           INNER JOIN  aliases AS al ON (al.uid = a.uid AND al.type IN (\'alias\', \'a_vie\'))
-                                WHERE  al.alias = {?}', $mbox);
-            if ($res->numRows()) {
-                return $res->fetchOneCell();
-            }
-
-            /** TODO: implements this by inspecting the profile.
-            if (preg_match('/^(.*)\.([0-9]{4})$/u', $mbox, $matches)) {
-                $res = XDB::query('SELECT  a.uid
-                                     FROM  accounts AS a
-                               INNER JOIN  aliases AS al ON (al.id = a.uid AND al.type IN ('alias', 'a_vie'))
-                                    WHERE  al.alias = {?} AND a.promo = {?}', $matches[1], $matches[2]);
-                if ($res->numRows() == 1) {
-                    return $res->fetchOneCell();
-                }
-            }*/
-
-            throw new UserNotFoundException();
+            $email = $login;
+            $domain = $globals->mail->domain;
+        } else {
+            list($email, $domain) = explode('@', $login);
         }
 
-        // Looks for $login as an email alias from the dedicated alias domain.
-        if ($fqdn == $globals->mail->alias_dom || $fqdn == $globals->mail->alias_dom2) {
-            $res = XDB::query("SELECT  redirect
-                                 FROM  virtual_redirect
-                           INNER JOIN  virtual USING(vid)
-                                WHERE  alias = {?}", $mbox . '@' . $globals->mail->alias_dom);
-            if ($redir = $res->fetchOneCell()) {
-                // We now have a valid alias, which has to be translated to an hruid.
-                list($alias, $alias_fqdn) = explode('@', $redir);
-                $res = XDB::query("SELECT  a.uid
-                                     FROM  accounts AS a
-                                LEFT JOIN  aliases AS al ON (al.uid = a.uid AND al.type IN ('alias', 'a_vie'))
-                                    WHERE  al.alias = {?}", $alias);
-                if ($res->numRows()) {
-                    return $res->fetchOneCell();
-                }
-            }
-
-            throw new UserNotFoundException();
+        // Checks if $login is a valid alias on any domain.
+        $res = XDB::fetchOneCell('SELECT  s.uid
+                                    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.email = {?} AND d.name = {?}',
+                                 $email, $domain);
+        if ($res) {
+            return $res;
         }
 
         // Looks for an account with the given email.
-        $res = XDB::query('SELECT  a.uid
-                             FROM  accounts AS a
-                            WHERE  a.email = {?}', $login);
+        $res = XDB::query('SELECT  uid
+                             FROM  accounts
+                            WHERE  email = {?}', $login);
         if ($res->numRows() == 1) {
             return $res->fetchOneCell();
         }
 
         // Otherwise, we do suppose $login is an email redirection.
-        $res = XDB::query("SELECT  a.uid
-                             FROM  accounts AS a
-                        LEFT JOIN  emails AS e ON (e.uid = a.uid)
-                            WHERE  e.email = {?}", $login);
+        $res = XDB::query('SELECT  uid
+                             FROM  email_redirect_account
+                            WHERE  redirect = {?}', $login);
         if ($res->numRows() == 1) {
             return $res->fetchOneCell();
         }
@@ -148,6 +125,10 @@ class User extends PlUser
 
     protected static function loadMainFieldsFromUIDs(array $uids, $respect_order = true)
     {
+        if (empty($uids)) {
+            return PlIteratorUtils::emptyIterator();
+        }
+
         global $globals;
         $joins = '';
         $fields = array();
@@ -155,6 +136,7 @@ class User extends PlUser
             $joins .= XDB::format("LEFT JOIN group_members AS gpm ON (gpm.uid = a.uid AND gpm.asso_id = {?})\n", $globals->asso('id'));
             $fields[] = 'gpm.perms AS group_perms';
             $fields[] = 'gpm.comm AS group_comm';
+            $fields[] = 'gpm.position AS group_position';
         }
         if (count($fields) > 0) {
             $fields = ', ' . implode(', ', $fields);
@@ -170,26 +152,35 @@ class User extends PlUser
 
         $uids = array_map(array('XDB', 'escape'), $uids);
 
-        return XDB::iterator('SELECT  a.uid, a.hruid, a.registration_date, ah.alias AS homonym,
-                                      CONCAT(af.alias, \'@' . $globals->mail->domain . '\') AS forlife,
-                                      CONCAT(af.alias, \'@' . $globals->mail->domain2 . '\') AS forlife_alternate,
-                                      CONCAT(ab.alias, \'@' . $globals->mail->domain . '\') AS bestalias,
-                                      CONCAT(ab.alias, \'@' . $globals->mail->domain2 . '\') AS bestalias_alternate,
-                                      a.full_name, a.display_name, a.sex = \'female\' AS gender,
-                                      IF(a.state = \'active\', at.perms, \'\') AS perms,
-                                      a.email_format, a.is_admin, a.state, a.type, a.skin,
+        return XDB::iterator('SELECT  a.uid, a.hruid, a.registration_date, h.uid IS NOT NULL AS homonym,
+                                      IF(ef.email IS NULL, NULL, CONCAT(ef.email, \'@\', MAX(df.name))) AS forlife,
+                                      IF(ef.email IS NULL, NULL, CONCAT(ef.email, \'@\', MIN(df.name))) AS forlife_alternate,
+                                      IF(eb.email IS NULL, NULL, CONCAT(eb.email, \'@\', MAX(db.name))) AS bestalias,
+                                      IF(eb.email IS NULL, NULL, CONCAT(eb.email, \'@\', MIN(db.name))) AS bestalias_alternate,
+                                      (er.redirect IS NULL AND a.state = \'active\') AS lost,
+                                      a.email, a.full_name, a.directory_name, a.display_name, a.sex = \'female\' AS gender,
+                                      IF(a.state = \'active\', CONCAT(at.perms, \',\', IF(a.user_perms IS NULL, \'\', a.user_perms)), \'\') AS perms,
+                                      a.user_perms, a.email_format, a.is_admin, a.state, a.type, at.description AS type_description, a.skin,
                                       FIND_IN_SET(\'watch\', a.flags) AS watch, a.comment,
-                                      a.weak_password IS NOT NULL AS weak_access,
-                                      a.token IS NOT NULL AS token_access,
-                                      (e.email IS NULL AND NOT FIND_IN_SET(\'googleapps\', eo.storage)) AND a.state != \'pending\' AS lost
+                                      a.weak_password IS NOT NULL AS weak_access, g.g_account_name IS NOT NULL AS googleapps,
+                                      a.token IS NOT NULL AS token_access, a.token, a.last_version,
+                                      UNIX_TIMESTAMP(s.start) AS lastlogin, s.host, UNIX_TIMESTAMP(fp.last_seen) AS banana_last
                                       ' . $fields . '
-                                FROM  accounts AS a
-                          INNER JOIN  account_types AS at ON (at.type = a.type)
-                           LEFT JOIN  aliases AS af ON (af.uid = a.uid AND af.type = \'a_vie\')
-                           LEFT JOIN  aliases AS ab ON (ab.uid = a.uid AND FIND_IN_SET(\'bestalias\', ab.flags))
-                           LEFT JOIN  aliases AS ah ON (ah.uid = a.uid AND ah.type = \'homonyme\')
-                           LEFT JOIN  emails AS e ON (e.uid = a.uid AND e.flags = \'active\')
-                           LEFT JOIN  email_options AS eo ON (eo.uid = a.uid)
+                                FROM  accounts               AS a
+                          INNER JOIN  account_types          AS at ON (at.type = a.type)
+                           LEFT JOIN  email_source_account   AS ef ON (ef.uid = a.uid AND ef.type = \'forlife\')
+                           LEFT JOIN  email_virtual_domains  AS mf ON (ef.domain = mf.id)
+                           LEFT JOIN  email_virtual_domains  AS df ON (df.aliasing = mf.id)
+                           LEFT JOIN  email_source_account   AS eb ON (eb.uid = a.uid AND eb.flags = \'bestalias\')
+                           LEFT JOIN  email_virtual_domains  AS mb ON (eb.domain = mb.id)
+                           LEFT JOIN  email_virtual_domains  AS db ON (db.aliasing = mb.id)
+                           LEFT JOIN  email_redirect_account AS er ON (er.uid = a.uid AND er.flags = \'active\' AND er.broken_level < 3
+                                                                       AND er.type != \'imap\' AND er.type != \'homonym\')
+                           LEFT JOIN  homonyms_list          AS h  ON (h.uid = a.uid)
+                           LEFT JOIN  gapps_accounts         AS g  ON (a.uid = g.l_userid AND g.g_status = \'active\')
+                           LEFT JOIN  log_last_sessions      AS ls ON (ls.uid = a.uid)
+                           LEFT JOIN  log_sessions           AS s  ON (s.id = ls.id)
+                           LEFT JOIN  forum_profiles         AS fp ON (fp.uid = a.uid)
                                    ' . $joins . '
                                WHERE  a.uid IN (' . implode(', ', $uids) . ')
                             GROUP BY  a.uid
@@ -208,35 +199,6 @@ class User extends PlUser
         $this->fillFromArray(self::loadMainFieldsFromUIDs(array($this->uid))->next());
     }
 
-    // Specialization of the fillFromArray method, to implement hacks to enable
-    // lazy loading of user's main properties from the session.
-    // TODO(vzanotti): remove the conversion hacks once the old codebase will
-    // stop being used actively.
-    protected function fillFromArray(array $values)
-    {
-        // Also, if display_name and full_name are not known, but the user's
-        // surname and last name are, we can construct the former two.
-        if (isset($values['prenom']) && isset($values['nom'])) {
-            if (!isset($values['display_name'])) {
-                $values['display_name'] = ($values['prenom'] ? $values['prenom'] : $values['nom']);
-            }
-            if (!isset($values['full_name'])) {
-                $values['full_name'] = $values['prenom'] . ' ' . $values['nom'];
-            }
-        }
-
-        // We also need to convert the gender (usually named "femme"), and the
-        // email format parameter (valued "texte" instead of "text").
-        if (isset($values['femme'])) {
-            $values['gender'] = (bool) $values['femme'];
-        }
-        if (isset($values['mail_fmt'])) {
-            $values['email_format'] = $values['mail_fmt'];
-        }
-
-        parent::fillFromArray($values);
-    }
-
     // Specialization of the buildPerms method
     // This function build 'generic' permissions for the user. It does not take
     // into account page specific permissions (e.g X.net group permissions)
@@ -251,6 +213,12 @@ class User extends PlUser
         $this->perm_flags = self::makePerms($this->perms, $this->is_admin);
     }
 
+    public function setPerms($perms)
+    {
+        $this->perms = $perms;
+        $this->perm_flags = null;
+    }
+
     // We do not want to store the password in the object.
     // So, fetch it 'on demand'
     public function password()
@@ -260,6 +228,11 @@ class User extends PlUser
                                    WHERE  a.uid = {?}', $this->id());
     }
 
+    public function isActive()
+    {
+        return $this->state == 'active';
+    }
+
     /** Overload PlUser::promo(): there no promo defined for a user in the current
      * schema. The promo is a field from the profile.
      */
@@ -271,6 +244,16 @@ class User extends PlUser
         return $this->profile()->promo();
     }
 
+    public function category()
+    {
+        $promo = $this->promo();
+        if (!empty($promo)) {
+            return $promo;
+        } else {
+            return $this->type_description;
+        }
+    }
+
     public function firstName()
     {
         if (!$this->hasProfile()) {
@@ -287,13 +270,37 @@ class User extends PlUser
         return $this->profile()->lastName();
     }
 
+    public function displayName()
+    {
+        if (!$this->hasProfile()) {
+            return $this->display_name;
+        }
+        return $this->profile()->yourself;
+    }
+
+    public function fullName($with_promo = false)
+    {
+        if (!$this->hasProfile()) {
+            return $this->full_name;
+        }
+        return $this->profile()->fullName($with_promo);
+    }
+
+    public function directoryName()
+    {
+        if (!$this->hasProfile()) {
+            return $this->directory_name;
+        }
+        return $this->profile()->directory_name;
+    }
+
     /** Return the main profile attached with this account if any.
      */
-    public function profile()
+    public function profile($forceFetch = false, $fields = 0x0000, $visibility = null)
     {
-        if (!$this->_profile_fetched) {
+        if (!$this->_profile_fetched || $forceFetch) {
             $this->_profile_fetched = true;
-            $this->_profile = Profile::get($this);
+            $this->_profile = Profile::get($this, $fields, $visibility);
         }
         return $this->_profile;
     }
@@ -305,105 +312,156 @@ class User extends PlUser
         return !is_null($this->profile());
     }
 
+    /** Return true if given a reference to the profile of this user.
+     */
+    public function isMyProfile($other)
+    {
+        if (!$other) {
+            return false;
+        } else if ($other instanceof Profile) {
+            $profile = $this->profile();
+            return $profile && $profile->id() == $other->id();
+        }
+        return false;
+    }
+
     /** Check if the user can edit to given profile.
      */
     public function canEdit(Profile $profile)
     {
-        // XXX: Check permissions (e.g. secretary permission)
-        //      and flags from the profile
+        if ($this->checkPerms(User::PERM_EDIT_DIRECTORY)) {
+            return true;
+        }
         return XDB::fetchOneCell('SELECT  pid
                                     FROM  account_profiles
                                    WHERE  uid = {?} AND pid = {?}',
                                  $this->id(), $profile->id());
     }
 
-    /** Get the email alias of the user.
+    /** Fetch existing auxiliary alias.
      */
     public function emailAlias()
     {
-        global $globals;
-        $data = $this->emailAliases($globals->mail->alias_dom);
-        if (count($data) > 0) {
-            return array_pop($data);
+        $aliases = $this->emailAliases();
+        if (count($aliases)) {
+            return $aliases[0];
         }
         return null;
     }
 
-    /** Get all the aliases the user belongs to.
+    /** Fetch existing auxiliary aliases.
      */
-    public function emailAliases($domain = null, $type = 'user',  $sub_state = false)
+    public function emailAliases()
     {
-        $join = XDB::format('(vr.redirect = {?} OR vr.redirect = {?}) ',
-                             $this->forlifeEmail(), $this->m4xForlifeEmail());
-        $where = '';
-        if (!is_null($domain)) {
-            $where = XDB::format('WHERE v.alias LIKE CONCAT("%@", {?})', $domain);
-        }
-        if (!is_null($type)) {
-            if (empty($where)) {
-                $where = XDB::format('WHERE v.type = {?}', $type);
-            } else {
-                $where .= XDB::format(' AND v.type = {?}', $type);
-            }
-        }
-        if ($sub_state) {
-            return XDB::fetchAllAssoc('alias', 'SELECT  v.alias, vr.redirect IS NOT NULL AS sub
-                                                  FROM  virtual AS v
-                                             LEFT JOIN  virtual_redirect AS vr ON (v.vid = vr.vid AND ' . $join . ')
-                                                 ' . $where);
-        } else {
-            return XDB::fetchColumn('SELECT  v.alias
-                                       FROM  virtual AS v
-                                 INNER JOIN  virtual_redirect AS vr ON (v.vid = vr.vid AND ' . $join . ')
-                                     ' . $where);
-        }
+        return XDB::fetchColumn('SELECT  CONCAT(s.email, \'@\', d.name)
+                                   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 = {?} AND s.type = \'alias_aux\'
+                               ORDER BY  d.name',
+                                $this->id());
     }
 
-    /** Get the alternative forlife email
-     * TODO: remove this uber-ugly hack. The issue is that you need to remove
-     * all @m4x.org addresses in virtual_redirect first.
-     * XXX: This is juste to make code more readable, to be remove as soon as possible
+    /** Get all group aliases the user belongs to.
      */
-    public function m4xForlifeEmail()
-    {
-        global $globals;
-        trigger_error('USING M4X FORLIFE', E_USER_NOTICE);
-        return $this->login() . '@' . $globals->mail->domain2;
+    public function emailGroupAliases($domain = null)
+    {
+        if (is_null($domain)) {
+            return XDB::fetchColumn('SELECT  CONCAT(v.email, \'@\', dv.name) AS alias
+                                       FROM  email_virtual         AS v
+                                 INNER JOIN  email_virtual_domains AS dv ON (v.domain = dv.id)
+                                 INNER JOIN  email_source_account  AS s  ON (s.uid = {?})
+                                 INNER JOIN  email_virtual_domains AS ms ON (s.domain = ms.id)
+                                 INNER JOIN  email_virtual_domains AS ds ON (ds.aliasing = ms.id)
+                                      WHERE  v.redirect = CONCAT(s.email, \'@\', ds.name) AND v.type = \'alias\'',
+                                    $this->id());
+        } else {
+            return XDB::fetchAllAssoc('alias',
+                                      'SELECT  CONCAT(v.email, \'@\', dv.name) AS alias, MAX(v.redirect = CONCAT(s.email, \'@\', ds.name)) AS sub
+                                         FROM  email_virtual         AS v
+                                   INNER JOIN  email_virtual_domains AS dv ON (v.domain = dv.id AND dv.name = {?})
+                                   INNER JOIN  email_source_account  AS s  ON (s.uid = {?})
+                                   INNER JOIN  email_virtual_domains AS ms ON (s.domain = ms.id)
+                                   INNER JOIN  email_virtual_domains AS ds ON (ds.aliasing = ms.id)
+                                        WHERE  v.type = \'alias\'
+                                     GROUP BY  v.email
+                                     ORDER BY  v.email',
+                                      $domain, $this->id());
+        }
     }
 
-
     /** Get marketing informations
      */
     private function fetchMarketingData()
     {
-        if (isset($this->last_known_email)) {
+        if (isset($this->pending_registration_date)) {
             return;
         }
-        $infos = XDB::fetchOneAssoc('SELECT  IF (MAX(m.last) > p.relance, MAX(m.last), p.relance) AS last_relance,
-                                             p.email AS last_known_email
-                                       FROM  register_pending AS p
-                                  LEFT JOIN  register_marketing AS m ON (p.uid = m.uid)
-                                      WHERE  p.uid = {?}
-                                   GROUP BY  p.uid', $this->id());
-        if (!$infos) {
-            $infos = array('last_relance' => null, 'last_known_email' => null);
+        $infos = XDB::fetchOneAssoc('SELECT  rp.date AS pending_registration_date, rp.email AS pending_registration_email,
+                                             rm.last AS last_marketing_date, rm.email AS last_marketing_email
+                                       FROM  accounts           AS a
+                                  LEFT JOIN  register_pending   AS rp ON (rp.uid = a.uid)
+                                  LEFT JOIN  register_marketing AS rm ON (rm.uid = a.uid AND rm.last != \'0000-00-00\')
+                                      WHERE  a.uid = {?}
+                                   ORDER BY  rm.last DESC', $this->id());
+        if (is_null($infos)) {
+            $infos = array(
+                'pending_registration_date'  => null,
+                'pending_registration_email' => null,
+                'last_marketing_date'        => null,
+                'last_marketing_email'       => null
+            );
         }
         $this->fillFromArray($infos);
     }
 
-    public function lastMarketingRelance()
+    public function pendingRegistrationDate()
+    {
+        $this->fetchMarketingData();
+        return $this->pending_registration_date;
+    }
+
+    public function pendingRegistrationEmail()
+    {
+        $this->fetchMarketingData();
+        return $this->pending_registration_email;
+    }
+
+    public function lastMarketingDate()
+    {
+        $this->fetchMarketingData();
+        return $this->last_marketing_date;
+    }
+
+    public function lastMarketingEmail()
     {
         $this->fetchMarketingData();
-        return $this->last_relance;
+        return $this->last_marketing_email;
     }
 
     public function lastKnownEmail()
     {
         $this->fetchMarketingData();
-        return $this->last_known_email;
+        if ($this->pending_registration_email > $this->last_marketing_date) {
+            return $this->pending_registration_email;
+        }
+        return $this->last_marketing_email;
     }
 
 
+    /** Format of the emails sent by the site
+     */
+    public function setEmailFormat($format)
+    {
+        Platal::assert($format == self::FORMAT_HTML || $format == self::FORMAT_TEXT,
+                       "Invalid email format \"$format\"");
+        XDB::execute("UPDATE  accounts
+                         SET  email_format = {?}
+                       WHERE  uid = {?}",
+                     $format, $this->uid);
+        $this->email_format = $format;
+    }
+
     /** Get watch informations
      */
     private function fetchWatchData()
@@ -462,6 +520,14 @@ class User extends PlUser
         return $this->watch_last;
     }
 
+    public function invalidWatchCache()
+    {
+        unset($this->watch_actions);
+        unset($this->watch_users);
+        unset($this->watch_last);
+        unset($this->watch_promos);
+    }
+
 
     // Contacts
     private $contacts = null;
@@ -487,36 +553,62 @@ class User extends PlUser
         return Profile::getBulkProfilesWithPIDs(array_keys($this->contacts));
     }
 
-    public function isContact(Profile &$profile)
+    public function isContact(Profile $profile)
     {
         $this->fetchContacts();
         return isset($this->contacts[$profile->id()]);
     }
 
+    public function isWatchedUser(Profile $profile)
+    {
+        return in_array($profile->id(), $this->watchUsers());
+    }
+
     // Groupes X
     private $groups = null;
-    public function groups()
+    public function groups($institutions = false, $onlyPublic = false)
     {
         if (is_null($this->groups)) {
-            $this->groups = XDB::fetchAllAssoc('asso_id', 'SELECT  asso_id, perms, comm
-                                                             FROM  group_members
+            $this->groups = XDB::fetchAllAssoc('asso_id', 'SELECT  gm.asso_id, gm.perms, gm.comm,
+                                                                   g.diminutif, g.nom, g.site, g.cat,
+                                                                   g.pub
+                                                             FROM  group_members AS gm
+                                                       INNER JOIN  groups AS g ON (g.id = gm.asso_id)
                                                             WHERE  uid = {?}',
                                                 $this->id());
         }
-        return $this->groups;
+        if (!$institutions && !$onlyPublic) {
+            return $this->groups;
+        } else {
+            $result = array();
+            foreach ($this->groups as $id=>$data) {
+                if ($institutions) {
+                    if ($data['cat'] != Group::CAT_GROUPESX && $data['cat'] != Group::CAT_INSTITUTIONS) {
+                        continue;
+                    }
+                }
+                if ($onlyPublic) {
+                    if ($data['pub'] != 'public') {
+                        continue;
+                    }
+                }
+                $result[$id] = $data;
+            }
+            return $result;
+        }
     }
 
     /**
      * Clears a user.
      *  *always deletes in: account_lost_passwords, register_marketing,
      *      register_pending, register_subs, watch_nonins, watch, watch_promo
-     *  *always keeps in: account_types, accounts, aliases, axletter_ins, carvas,
-     *      group_members, homonyms, newsletter_ins, register_mstats,
+     *  *always keeps in: account_types, accounts, email_virtual, carvas,
+     *      group_members, homonyms_list, newsletter_ins, register_mstats, email_source_account
      *  *deletes if $clearAll: account_auth_openid, announce_read, contacts,
-     *      email_options, email_send_save, emails, forum_innd, forum_profiles,
+     *      email_redirect_account, email_redirect_account, email_send_save, forum_innd, forum_profiles,
      *      forum_subs, gapps_accounts, gapps_nicknames, group_announces_read,
      *      group_member_sub_requests, reminder, requests, requests_hidden,
-     *      virtual, virtual_redirect, ML
+     *      email_virtual, ML
      *  *modifies if $clearAll: accounts
      *
      * Use cases:
@@ -527,20 +619,26 @@ class User extends PlUser
      */
     public function clear($clearAll = true)
     {
-        XDB::execute('DELETE FROM  account_lost_passwords, register_marketing,
-                                   register_pending, register_subs, watch_nonins,
-                                   watch, watch_promo
-                            WHERE  uid = {?}',
-                     $this->id());
+        $tables = array('account_lost_passwords', 'register_marketing',
+                        'register_pending', 'register_subs', 'watch_nonins',
+                        'watch', 'watch_promo');
+
+        foreach ($tables as $t) {
+            XDB::execute('DELETE FROM  ' . $t . '
+                                WHERE  uid = {?}',
+                                $this->id());
+        }
 
         if ($clearAll) {
+            global $globals;
+
             $groupIds = XDB::iterator('SELECT  asso_id
                                          FROM  group_members
                                         WHERE  uid = {?}',
                                       $this->id());
             while ($groupId = $groupIds->next()) {
                 $group = Group::get($groupId);
-                if ($group->notif_unsub) {
+                if (!empty($group) && $group->notif_unsub) {
                     $mailer = new PlMailer('xnetgrp/unsubscription-notif.mail.tpl');
                     $admins = $group->iterAdmins();
                     while ($admin = $admins->next()) {
@@ -553,41 +651,123 @@ class User extends PlUser
                 }
             }
 
-            XDB::execute('DELETE FROM  account_auth_openid, announce_read, contacts,
-                                       email_options, email_send_save, emails,
-                                       forum_innd, forum_profiles, forum_subs,
-                                       gapps_accounts, gapps_nicknames, group_announces_read,
-                                       group_members, group_member_sub_requests, reminder, requests,
-                                       requests_hidden
-                                WHERE  uid = {?}',
+            $tables = array('account_auth_openid', 'announce_read', 'contacts',
+                            'email_send_save', 'email_virtual',
+                            'forum_innd', 'forum_profiles', 'forum_subs',
+                            'group_announces_read', 'group_members',
+                            'group_member_sub_requests', 'reminder', 'requests',
+                            'requests_hidden');
+            foreach ($tables as $t) {
+                XDB::execute('DELETE FROM  ' . $t . '
+                                    WHERE  uid = {?}',
+                             $this->id());
+            }
+            XDB::execute('DELETE FROM  email_redirect_account
+                                WHERE  uid = {?} AND type != \'homonym\'',
                          $this->id());
+
+            foreach (array('gapps_accounts', 'gapps_nicknames') as $t) {
+                XDB::execute('DELETE FROM  ' . $t . '
+                                    WHERE  l_userid = {?}',
+                             $this->id());
+            }
+
             XDB::execute("UPDATE  accounts
                              SET  registration_date = 0, state = 'pending', password = NULL,
                                   weak_password = NULL, token = NULL, is_admin = 0
                            WHERE  uid = {?}",
                          $this->id());
 
-            XDB::execute('DELETE  v.*
-                            FROM  virtual          AS v
-                      INNER JOIN  virtual_redirect AS r ON (v.vid = r.vid)
-                           WHERE  redirect = {?} OR redirect = {?}',
-                         $this->forlifeEmail(), $this->m4xForlifeEmail());
-            XDB::execute('DELETE FROM  virtual_redirect
-                                WHERE  redirect = {?} OR redirect = {?}',
-                         $this->forlifeEmail(), $this->m4xForlifeEmail());
-
             if ($globals->mailstorage->googleapps_domain) {
                 require_once 'googleapps.inc.php';
 
-                if (GoogleAppsAccount::account_status($uid)) {
-                    $account = new GoogleAppsAccount($user);
+                if (GoogleAppsAccount::account_status($this->id())) {
+                    $account = new GoogleAppsAccount($this);
                     $account->suspend();
                 }
             }
         }
 
-        $mmlist = new MMList($this);
-        $mmlist->kill($alias, $clearAll);
+        $mmlist = new MMList(S::user());
+        $mmlist->kill($this->hruid, $clearAll);
+    }
+
+    // Merge all infos in other user and then clean this one
+    public function mergeIn(User $newuser) {
+        if ($this->profile()) {
+            // Don't disable user with profile in this way.
+            global $globals;
+            Platal::page()->trigError('Impossible de fusionner les comptes ' . $this->hruid . ' et ' . $newuser->hruid .
+                                      '. Contacte support@' . $globals->mail->domain . '.');
+            return false;
+        }
+
+        if ($this->forlifeEmail()) {
+            // If the new user is not registered and does not have already an email address,
+            // we need to give him the old user's email address if he has any.
+            if (!$newuser->perms) {
+                XDB::execute('UPDATE  accounts
+                                 SET  email = {?}
+                               WHERE  uid = {?} AND email IS NULL',
+                             $this->forlifeEmail(), $newuser->id());
+
+                // Reftech new user so its forlifeEmail will be correct.
+                $newuser = getSilentWithUID($newuser->id());
+            }
+
+            // Change email used in mailing lists.
+            if ($this->forlifeEmail() != $newuser->forlifeEmail()) {
+                // group mailing lists
+                $group_domains = XDB::fetchColumn('SELECT  g.mail_domain
+                                                     FROM  groups        AS g
+                                               INNER JOIN  group_members AS gm ON(g.id = gm.asso_id)
+                                                    WHERE  g.mail_domain != \'\' AND gm.uid = {?}',
+                                                  $this->id());
+                foreach ($group_domains as $mail_domain) {
+                    $mmlist = new MMList($this, $mail_domain);
+                    $mmlist->replace_email_in_all($this->forlifeEmail(), $newuser->forlifeEmail());
+                }
+                // main domain lists
+                $mmlist = new MMList($this);
+                $mmlist->replace_email_in_all($this->forlifeEmail(), $newuser->forlifeEmail());
+            }
+        }
+
+        // Updates user in following tables.
+        foreach (array('group_announces', 'payment_transactions', 'log_sessions', 'group_events') as $table) {
+            XDB::execute('UPDATE  ' . $table . '
+                             SET  uid = {?}
+                           WHERE  uid = {?}',
+                         $newuser->id(), $this->id());
+        }
+
+        // Merges user in following tables, ie updates when possible, then deletes remaining occurences of the old user.
+        foreach (array('group_announces_read', 'group_event_participants', 'group_member_sub_requests', 'group_members', 'email_redirect_account') as $table) {
+            XDB::execute('UPDATE IGNORE  ' . $table . '
+                                    SET  uid = {?}
+                                  WHERE  uid = {?}',
+                         $newuser->id(), $this->id());
+            XDB::execute('DELETE FROM  ' . $table . '
+                                WHERE  uid = {?}',
+                         $this->id());
+        }
+
+        // Eventually updates last session id and deletes old user's accounts entry.
+        $lastSession = XDB::fetchOneCell('SELECT  id
+                                            FROM  log_sessions
+                                           WHERE  uid = {?}
+                                        ORDER BY  start DESC
+                                           LIMIT  1',
+                                         $newuser->id());
+        XDB::execute('UPDATE  log_last_sessions
+                         SET  id = {?}
+                       WHERE  uid = {?}',
+                     $lastSession, $newuser->id());
+        XDB::execute('DELETE FROM  accounts
+                            WHERE  uid = {?}',
+                     $this->id());
+
+        return true;
     }
 
     // Return permission flags for a given permission level.
@@ -598,6 +778,11 @@ class User extends PlUser
         if ($is_admin) {
             $flags->addFlag(PERMS_ADMIN);
         }
+
+        // Access to private directory implies access to 'less'-private version.
+        if ($flags->hasFlag('directory_private')) {
+            $flags->addFlag('directory_ax');
+        }
         return $flags;
     }
 
@@ -639,6 +824,35 @@ class User extends PlUser
             || $dom == $globals->mail->alias_dom2;
     }
 
+    /* Tries to find pending accounts with an hruid close to $login. */
+    public static function getPendingAccounts($login, $iterator = false)
+    {
+        global $globals;
+
+        if (strpos($login, '@') === false) {
+            return null;
+        }
+
+        list($login, $domain) = explode('@', $login);
+
+        if ($domain && $domain != $globals->mail->domain && $domain != $globals->mail->domain2) {
+            return null;
+        }
+
+        $sql = "SELECT  uid, full_name
+                  FROM  accounts
+                 WHERE  state = 'pending' AND REPLACE(hruid, '-', '') LIKE
+                        CONCAT('%', REPLACE(REPLACE(REPLACE({?}, ' ', ''), '-', ''), '\'', ''), '%')
+              ORDER BY  full_name";
+        if ($iterator) {
+            return XDB::iterator($sql, $login);
+        } else {
+            $res = XDB::query($sql, $login);
+            return $res->fetchAllAssoc();
+        }
+    }
+
+
     public static function iterOverUIDs($uids, $respect_order = true)
     {
         return new UserIterator(self::loadMainFieldsFromUIDs($uids, $respect_order));
@@ -677,7 +891,11 @@ class User extends PlUser
         $table = array();
         if ($fetchProfile) {
             $profiles = Profile::iterOverUIDS($uids, true);
-            $profile = $profiles->next();
+            if ($profiles != null) {
+                $profile = $profiles->next();
+            } else {
+                $profile = null;
+            }
         }
 
         /** We iterate through the users, moving in
@@ -687,7 +905,7 @@ class User extends PlUser
          */
         while (($user = $users->next())) {
             if ($fetchProfile) {
-                if ($profile->owner_id == $user->id()) {
+                if ($profile != null && $profile->owner_id == $user->id()) {
                     $user->_profile = $profile;
                     $profile = $profiles->next();
                 }