From: Raphaël Barrois Date: Sun, 14 Feb 2010 23:01:47 +0000 (+0100) Subject: Fetch alternate bestalias/forlife for user X-Git-Tag: xorg/1.0.0~332^2~219 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=c82aa04cbc53045ba94e590c809a36ec06a637d6;p=platal.git Fetch alternate bestalias/forlife for user Use those only for display !! Signed-off-by: Raphaël Barrois --- diff --git a/classes/user.php b/classes/user.php index d6555af..d346eb3 100644 --- a/classes/user.php +++ b/classes/user.php @@ -164,7 +164,9 @@ class User extends PlUser $uids = array_map(array('XDB', 'escape'), $uids); return XDB::iterator('SELECT a.uid, a.hruid, a.registration_date, 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,