X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=dea0dcba2b41a25559d3eaafca2bb1b2d58e29db;hb=fe13bc1d7ba9f72d452ec07baf8538a74b7c67b8;hp=1dbe505cdae23d18dd512f3f3809f74824c96228;hpb=6e909db8e8f8a25a0d44e3ff74bcc5f76eb2ea92;p=platal.git

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index 1dbe505..dea0dcb 100644
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,6 +21,11 @@
 
 class XorgSession extends PlSession
 {
+    const INVALID_USER = -2;
+    const NO_COOKIE = -1;
+    const COOKIE_SUCCESS = 0;
+    const INVALID_COOKIE = 1;
+
     public function __construct()
     {
         parent::__construct();
@@ -29,10 +34,15 @@ class XorgSession extends PlSession
     public function startAvailableAuth()
     {
         if (!S::logged()) {
-            $cookie = $this->tryCookie();
-            if ($cookie == 0) {
-                return $this->start(AUTH_COOKIE);
-            } else if ($cookie == 1 || $cookie == -2) {
+            switch ($this->tryCookie()) {
+              case self::COOKIE_SUCCESS:
+                if (!$this->start(AUTH_COOKIE)) {
+                    return false;
+                }
+                break;
+
+              case self::INVALID_USER:
+              case self::INVALID_COOKIE:
                 return false;
             }
         }
@@ -48,7 +58,7 @@ class XorgSession extends PlSession
     {
         S::kill('auth_by_cookie');
         if (Cookie::v('access') == '' || !Cookie::has('uid')) {
-            return -1;
+            return self::NO_COOKIE;
         }
 
         $res = XDB::query('SELECT  uid, password
@@ -57,22 +67,21 @@ class XorgSession extends PlSession
                          Cookie::i('uid'));
         if ($res->numRows() != 0) {
             list($uid, $password) = $res->fetchOneRow();
-            $expected_value = sha1($password);
-            if ($expected_value == Cookie::v('access')) {
+            if (sha1($password) == Cookie::v('access')) {
                 S::set('auth_by_cookie', $uid);
-                return 0;
+                return self::COOKIE_SUCCESS;
             } else {
-                return 1;
+                return self::INVALID_COOKIE;
             }
         }
-        return -2;
+        return self::INVALID_USER;
     }
 
     private function checkPassword($uname, $login, $response, $login_type)
     {
         $res = XDB::query('SELECT  a.uid, a.password
                              FROM  accounts AS a
-                       INNER JOIN  aliases  AS l ON (l.id = a.uid AND l.type != \'homonyme\')
+                       INNER JOIN  aliases  AS l ON (l.uid = a.uid AND l.type != \'homonyme\')
                             WHERE  l.' . $login_type . ' = {?} AND a.state = \'active\'',
                           $login);
         if (list($uid, $password) = $res->fetchOneRow()) {
@@ -109,7 +118,7 @@ class XorgSession extends PlSession
             if (!S::logged()) {
                 S::set('auth', AUTH_COOKIE);
             }
-            return User::getSilentWithValues(null, array('user_id' => S::i('auth_by_cookie')));
+            return User::getSilentWithUID(S::i('auth_by_cookie'));
         }
 
 
@@ -166,12 +175,12 @@ class XorgSession extends PlSession
             S::kill('challenge');
             S::logger($uid)->log('auth_ok');
         }
-        return User::getSilentWithValues(null, array('user_id' => $uid));
+        return User::getSilentWithUID($uid);
     }
 
     protected function startSessionAs($user, $level)
     {
-        if ((!is_null(S::v('user')) && S::v('user')->id() != $user->id())
+        if ((!is_null(S::user()) && S::user()->id() != $user->id())
             || (S::has('uid') && S::i('uid') != $user->id())) {
             return false;
         } else if (S::has('uid')) {
@@ -188,18 +197,22 @@ class XorgSession extends PlSession
         $res  = XDB::query("SELECT  a.uid, a.hruid, a.display_name, a.full_name,
                                     a.sex = 'female' AS femme, a.email_format,
                                     a.token, FIND_IN_SET('watch', a.flags) AS watch_account,
-                                    UNIX_TIMESTAMP(fp.last_seen) AS banana_last, w.last AS watch_last,
+                                    UNIX_TIMESTAMP(fp.last_seen) AS banana_last, UNIX_TIMESTAMP(w.last) AS watch_last,
                                     a.last_version, g.g_account_name IS NOT NULL AS googleapps,
                                     UNIX_TIMESTAMP(s.start) AS lastlogin, s.host,
                                     a.is_admin, at.perms
-                              FROM  accounts        AS a
-                        INNER JOIN  account_types   AS at ON(a.type = at.type)
-                        INNER JOIN  watch           AS w  ON(w.uid = a.uid)
-                         LEFT JOIN  forum_profiles  AS fp ON(fp.uid = a.uid)
-                         LEFT JOIN  gapps_accounts  AS g  ON(a.uid = g.l_userid AND g.g_status = 'active')
-                         LEFT JOIN  logger.last_sessions AS ls ON (ls.uid = a.uid)
-                         LEFT JOIN  logger.sessions AS s  ON(s.id = ls.id)
+                              FROM  accounts          AS a
+                        INNER JOIN  account_types     AS at ON (a.type = at.type)
+                         LEFT JOIN  watch             AS w  ON (w.uid = a.uid)
+                         LEFT JOIN  forum_profiles    AS fp ON (fp.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)
                              WHERE  a.uid = {?} AND a.state = 'active'", $user->id());
+        if ($res->numRows() != 1) {
+            return false;
+        }
+
         $sess = $res->fetchOneAssoc();
         $perms = $sess['perms'];
         unset($sess['perms']);
@@ -259,7 +272,7 @@ class XorgSession extends PlSession
     {
         $res = XDB::query('SELECT  a.uid AS user_id, a.hruid
                              FROM  aliases  AS l
-                       INNER JOIN  accounts AS a ON (l.id = a.uid AND a.state = \'active\')
+                       INNER JOIN  accounts AS a ON (l.uid = a.uid AND a.state = \'active\')
                             WHERE  a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'',
                            $token, $login);
         if ($res->numRows() == 1) {
@@ -298,15 +311,16 @@ class XorgSession extends PlSession
     public function updateNbNotifs()
     {
         require_once 'notifs.inc.php';
-        $n = select_notifs(false, S::i('uid'), S::v('watch_last'), false);
-        S::set('notifs', $n->numRows());
+        $user = S::user();
+        $n = Watch::getCount($user);
+        S::set('notifs', $n);
     }
 
     public function setAccessCookie($replace = false, $log = true) {
         if (S::suid() || ($replace && !Cookie::blank('access'))) {
             return;
         }
-        Cookie::set('access', sha1(S::v('password')), 300, true);
+        Cookie::set('access', sha1(S::user()->password()), 300, true);
         if ($log) {
             S::logger()->log('cookie_on');
         }