From fd7d304d9ba71065ab51488c8b0765e5cd354d5d Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Fri, 13 Jun 2008 16:17:31 +0200 Subject: [PATCH] Migrates Xorg/Xnet's session to the new hruid field, and add it as a session variable. Signed-off-by: Vincent Zanotti --- include/xnet/session.inc.php | 6 +++--- include/xorg/session.inc.php | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/xnet/session.inc.php b/include/xnet/session.inc.php index 92c189a..1441f19 100644 --- a/include/xnet/session.inc.php +++ b/include/xnet/session.inc.php @@ -119,11 +119,11 @@ class XnetSession $res = XDB::query(" SELECT u.user_id AS uid, prenom, nom, perms, promo, password, FIND_IN_SET('femme', u.flags) AS femme, - a.alias AS forlife, a2.alias AS bestalias, q.core_mail_fmt AS mail_fmt, q.core_rss_hash + u.hruid, a.alias AS forlife, a2.alias AS bestalias, q.core_mail_fmt AS mail_fmt, q.core_rss_hash 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)) + 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)) WHERE u.user_id = {?} AND u.perms IN('admin','user') LIMIT 1", Get::i('uid')); $_SESSION = array_merge($_SESSION, $res->fetchOneAssoc()); diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php index 34581a1..58850c9 100644 --- a/include/xorg/session.inc.php +++ b/include/xorg/session.inc.php @@ -65,7 +65,7 @@ class XorgSession // ou passwordpromptscreenlogged.tpl if (S::has('suid')) { $suid = S::v('suid'); - $login = $uname = $suid['forlife']; + $login = $uname = $suid['hruid']; $redirect = false; } else { $uname = Env::v('username'); @@ -241,13 +241,13 @@ function start_connexion ($uid, $identified) $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, + u.hruid, a.alias AS forlife, a2.alias 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 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)) + 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)) WHERE u.user_id = {?} AND u.perms IN('admin','user')", $uid); $sess = $res->fetchOneAssoc(); $res = XDB::query("SELECT UNIX_TIMESTAMP(s.start) AS lastlogin, s.host @@ -262,7 +262,7 @@ function start_connexion ($uid, $identified) if ($suid) { $logger = new CoreLogger($uid, $suid['uid']); - $logger->log("suid_start", S::v('forlife')." by {$suid['uid']}"); + $logger->log("suid_start", S::v('hruid') . " by {$suid['uid']}"); $sess['suid'] = $suid; } else { $logger = S::v('log', new CoreLogger($uid)); -- 2.1.4