X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fxorgsession.php;h=796a5aa8101fe3c4c0b6f79eb5f31217e8aba25e;hb=641f2115180050769dd7519b82d21246f329a997;hp=f7573377379b6f2fb8e6d1869c06d4b0bd5f572d;hpb=89274a92006f2e3d3124667cd77525f7d01f8012;p=platal.git

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index f757337..796a5aa 100644
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -118,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'));
         }
 
 
@@ -175,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')) {
@@ -206,9 +206,13 @@ class XorgSession extends PlSession
                         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)
+                         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']);
@@ -242,21 +246,6 @@ class XorgSession extends PlSession
         return true;
     }
 
-    /** Start a session without authentication data for the given user.
-     * This is used to identify the user after his registration, to be
-     * removed after rewriting registration procedure.
-     * XXX: Temporary
-     */
-    public function startWeakSession($user)
-    {
-        if (!$this->startSessionAs($user, AUTH_MDP)) {
-            $this->destroy();
-            return false;
-        }
-        S::set('auth', AUTH_MDP);
-        return true;
-    }
-
     private function securityChecks()
     {
         $mail_subject = array();