Merge branch 'master' into hruid

Conflicts:
	classes/xorgsession.php

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --cc classes/xorgsession.php
index c26e6e3,1424389..7cda0c9
--- 1/classes/xorgsession.php
--- 2/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@@ -185,19 -185,18 +185,20 @@@ class XorgSession extends PlSessio
          }
          unset($_SESSION['log']);
  
 -        $res  = XDB::query('SELECT  u.user_id AS uid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie,
 -                                    matricule, password, FIND_IN_SET(\'femme\', u.flags) AS femme,
 -                                    a.alias AS forlife, a2.alias AS bestalias,
+         // Retrieves main user properties.
 +        global $globals;
 +        $res  = XDB::query("SELECT  u.user_id AS uid, u.hruid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie,
 +                                    matricule, password, FIND_IN_SET('femme', u.flags) AS femme,
 +                                    CONCAT(a.alias, '@{$globals->mail->domain}') AS forlife,
 +                                    CONCAT(a2.alias, '@{$globals->mail->domain}') AS bestalias,
                                      q.core_mail_fmt AS mail_fmt, UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, q.core_rss_hash,
 -                                    FIND_IN_SET(\'watch\', u.flags) AS watch_account, q.last_version, g.g_account_name IS NOT NULL AS googleapps
 +                                    FIND_IN_SET('watch', u.flags) AS watch_account, q.last_version, g.g_account_name IS NOT NULL AS googleapps
                                FROM  auth_user_md5   AS u
                          INNER JOIN  auth_user_quick AS q  USING(user_id)
 -                        INNER JOIN  aliases         AS a  ON (u.user_id = a.id AND a.type = \'a_vie\')
 -                        INNER JOIN  aliases         AS a2 ON (u.user_id = a2.id AND FIND_IN_SET(\'bestalias\', a2.flags))
 -                         LEFT JOIN  gapps_accounts  AS g  ON (u.user_id = g.l_userid AND g.g_status = \'active\')
 -                             WHERE  u.user_id = {?} AND u.perms IN(\'admin\', \'user\')', $uid);
 +                        INNER JOIN  aliases         AS a  ON (u.user_id = a.id AND a.type = 'a_vie')
 +                        INNER JOIN  aliases         AS a2 ON (u.user_id = a2.id AND FIND_IN_SET('bestalias', a2.flags))
 +                         LEFT JOIN  gapps_accounts  AS g  ON (u.user_id = g.l_userid AND g.g_status = 'active')
 +                             WHERE  u.user_id = {?} AND u.perms IN('admin', 'user')", $uid);
          $sess = $res->fetchOneAssoc();
          $perms = $sess['perms'];
          unset($sess['perms']);