From: Florent Bruneau Date: Tue, 23 Dec 2008 12:08:17 +0000 (+0100) Subject: Fix MDP auth within a session. X-Git-Tag: xorg/1.0.0~332^2~470 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=867b04efdfd6ab50f7a34230d6d7a60b996cb2f6;p=platal.git Fix MDP auth within a session. Signed-off-by: Florent Bruneau --- diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 9dfca1d..c565857 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -170,7 +170,7 @@ class XorgSession extends PlSession protected function startSessionAs($user, $level) { - if ((!is_null(S::v('user')) && S::i('user') != $user->id()) + if ((!is_null(S::v('user')) && S::v('user')->id() != $user->id()) || (S::has('uid') && S::i('uid') != $user->id())) { return false; } else if (S::has('uid')) { @@ -186,7 +186,7 @@ class XorgSession extends PlSession /** TODO: Data to move are: banana_last, watch_last, last_version */ /** TODO: Use the User object to fetch all this */ $res = XDB::query("SELECT a.uid, a.hruid, a.display_name, a.full_name, a.password, - a.sex = 'female' AS femme, a.email_format as mail_fmt, + a.sex = 'female' AS femme, a.email_format, a.token, FIND_IN_SET('watch', a.flags) AS watch_account, UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, q.last_version, g.g_account_name IS NOT NULL AS googleapps,