Adds missing include in modules/admin.

[platal.git] / classes / xorgsession.php

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index 534ed86..91cda51 100644 (file)
--- a/classes/xorgsession.php
+++ b/classes/xorgsession.php
@@ -37,7 +37,7 @@ class XorgSession extends PlSession
             }
         }
         if ((check_ip('dangerous') && S::has('uid')) || check_account()) {
-            $_SESSION['log']->log("view_page", $_SERVER['REQUEST_URI']);
+            S::logger()->log("view_page", $_SERVER['REQUEST_URI']);
         }
         return true;
     }
@@ -140,11 +140,10 @@ class XorgSession extends PlSession
          */
         if (S::has('suid')) {
             $suid  = S::v('suid');
-            $login = $uname = $suid['hruid'];
+            $login = $uname = $suid['uid'];
             $redirect = false;
         } else {
             $uname = Env::v('username');
-
             if (Env::v('domain') == "alias") {
                 $res = XDB::query('SELECT  redirect
                                      FROM  virtual
@@ -163,17 +162,27 @@ class XorgSession extends PlSession
             }
         }
 
-        $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && preg_match('/^\d*$/', $uname)) ? 'id' : 'alias');
+        $uid = $this->checkPassword($uname, $login, Post::v('response'), (!$redirect && is_numeric($uname)) ? 'id' : 'alias');
+        if (!is_null($uid) && S::has('suid')) {
+            $suid = S::v('suid');
+            if ($suid['uid'] == $uid) {
+                $uid = S::i('uid');
+            } else {
+                $uid = null;
+            }
+        }
         if (!is_null($uid)) {
             S::set('auth', AUTH_MDP);
-            if (Post::has('domain')) {
-                if (($domain = Post::v('domain', 'login')) == 'alias') {
-                    setcookie('ORGdomain', "alias", (time() + 25920000), '/', '', 0);
-                } else {
-                    setcookie('ORGdomain', '', (time() - 3600), '/', '', 0);
+            if (!S::has('suid')) {
+                if (Post::has('domain')) {
+                    if (($domain = Post::v('domain', 'login')) == 'alias') {
+                        setcookie('ORGdomain', "alias", (time() + 25920000), '/', '', 0);
+                    } else {
+                        setcookie('ORGdomain', '', (time() - 3600), '/', '', 0);
+                    }
+                    // pour que la modification soit effective dans le reste de la page
+                    $_COOKIE['ORGdomain'] = $domain;
                 }
-                // pour que la modification soit effective dans le reste de la page
-                $_COOKIE['ORGdomain'] = $domain;
             }
             S::kill('challenge');
             S::logger($uid)->log('auth_ok');
@@ -188,34 +197,27 @@ class XorgSession extends PlSession
         } else if (S::has('uid')) {
             return true;
         }
-        if ($level == -1) {
-            S::set('auth', AUTH_COOKIE);
+        if ($level == AUTH_SUID) {
+            S::set('auth', AUTH_MDP);
+            unset($_SESSION['log']);
         }
-        unset($_SESSION['log']);
 
         // Retrieves main user properties.
         $res  = XDB::query("SELECT  u.user_id AS uid, u.hruid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie,
                                     matricule, password, FIND_IN_SET('femme', u.flags) AS femme,
                                     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, g.g_account_name IS NOT NULL AS googleapps
+                                    FIND_IN_SET('watch', u.flags) AS watch_account, q.last_version, g.g_account_name IS NOT NULL AS googleapps,
+                                    UNIX_TIMESTAMP(s.start) AS lastlogin, s.host
                               FROM  auth_user_md5   AS u
                         INNER JOIN  auth_user_quick AS q  USING(user_id)
                          LEFT JOIN  gapps_accounts  AS g  ON (u.user_id = g.l_userid AND g.g_status = 'active')
+                         LEFT JOIN  logger.last_sessions AS ls ON (ls.uid = u.user_id)
+                         LEFT JOIN  logger.sessions AS s  ON(s.id = ls.id)
                              WHERE  u.user_id = {?} AND u.perms IN('admin', 'user')", $uid);
         $sess = $res->fetchOneAssoc();
         $perms = $sess['perms'];
         unset($sess['perms']);
 
-        // Retrieves account usage information (last login, last host).
-        $res = XDB::query('SELECT  UNIX_TIMESTAMP(s.start) AS lastlogin, s.host
-                             FROM  logger.sessions AS s
-                            WHERE  s.uid = {?} AND s.suid = 0
-                         ORDER BY  s.start DESC
-                            LIMIT  1', $uid);
-        if ($res->numRows()) {
-            $sess = array_merge($sess, $res->fetchOneAssoc());
-        }
-
         // Loads the data into the real session.
         $_SESSION = array_merge($_SESSION, $sess);
 
@@ -226,19 +228,18 @@ class XorgSession extends PlSession
             $logger->log("suid_start", S::v('hruid') . " by " . $suid['hruid']);
         } else {
             $logger = S::logger($uid);
+            $logger->saveLastSession();
             setcookie('ORGuid', $uid, (time() + 25920000), '/', '', 0);
 
             if (S::i('auth_by_cookie') == $uid || Post::v('remember', 'false') == 'true') {
                 $cookie = hash_encrypt($sess['password']);
                 setcookie('ORGaccess', $cookie, (time() + 25920000), '/', '', 0);
-                if ($logger && S::i('auth_by_cookie') != $uid) {
+                if (S::i('auth_by_cookie') != $uid) {
                     $logger->log("cookie_on");
                 }
             } else {
                 setcookie('ORGaccess', '', time() - 3600, '/', '', 0);
-                if ($logger) {
-                    $logger->log("cookie_off");
-                }
+                $logger->log("cookie_off");
             }
         }