Adds missing include in modules/admin.

[platal.git] / classes / xorgsession.php

diff --git a/classes/xorgsession.php b/classes/xorgsession.php
index 341d67a..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,10 +197,10 @@ 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,
@@ -225,14 +234,12 @@ class XorgSession extends PlSession
             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");
             }
         }