Add check for valid session

[qtadmin.git] / lib / utils.inc.php

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index c06729f7e023dbe7dd73bc2dbd174121337e0107..dcdd8518eb4d7b458876edf51d49eb23f80fb6ea 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -43,16 +43,20 @@ class Utils {
 
         $this->log("Init Utils", 4);
 
 
         $this->log("Init Utils", 4);
 

+        $this->log("__construct[1]: user ".var_export($this->settings['user'], true), 3);

         $this->startSession();
         $this->startSession();

+        $this->log("__construct[2]: user ".var_export($this->settings['user'], true), 3);

 
         if (! isset($_SESSION['settings'])) {
             $this->initSettings();
         }
 
         if (! isset($_SESSION['settings'])) {
             $this->initSettings();
         }

+        $this->log("__construct[3]: user ".var_export($this->settings['user'], true), 3);

         $this->settings = $_SESSION['settings'];
         $this->settings = $_SESSION['settings'];

+        $this->log("__construct[4]: user ".var_export($this->settings['user'], true), 3);

 
         if ($CFG->auth_method == 'HTTP_AUTH') {
 
         if ($CFG->auth_method == 'HTTP_AUTH') {

-            if (isset($this->server['PHP_AUTH_USER'])) {
-                $this->settings['user'] = $this->server['PHP_AUTH_USER'];
+            if (isset($_SERVER['PHP_AUTH_USER'])) {
+                $this->settings['user'] = $_SERVER['PHP_AUTH_USER'];

                 $this->settings['loginStatus'] = 'OK';
                 if ($CFG->admin_user == $this->settings['user'])
                     $this->settings['admin'] = true;
                 $this->settings['loginStatus'] = 'OK';
                 if ($CFG->admin_user == $this->settings['user'])
                     $this->settings['admin'] = true;


@@ -99,7 +103,6 @@ class Utils {
         }
 
         $this->settings = array(
         }
 
         $this->settings = array(

-            'server' => $_SERVER,

             'user' => null,
             'admin' => false,
             'loginStatus' => 'Not logged in',
             'user' => null,
             'admin' => false,
             'loginStatus' => 'Not logged in',


@@ -140,7 +143,8 @@ class Utils {
         $time = $_SERVER['REQUEST_TIME'];
         if (isset($_SESSION['LAST_ACTIVITY']) &&
                 ($time - $_SESSION['LAST_ACTIVITY']) >= $this->settings['timeout']) {
         $time = $_SERVER['REQUEST_TIME'];
         if (isset($_SESSION['LAST_ACTIVITY']) &&
                 ($time - $_SESSION['LAST_ACTIVITY']) >= $this->settings['timeout']) {

-            echo 'R_TIME: '.date('c', $time).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']);
+            $this->log('R_TIME: '.date('c', $time).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY'].
+            'Test: '.($time - $_SESSION['LAST_ACTIVITY'])).' >= '.$this->settings['timeout'], 3);

             $this->logout();
         } else {
             $_SESSION['LAST_ACTIVITY'] = $time;
             $this->logout();
         } else {
             $_SESSION['LAST_ACTIVITY'] = $time;


@@ -247,21 +251,23 @@ class Utils {
         global $CFG;
         $loggedIn = false;
 
         global $CFG;
         $loggedIn = false;
 

-        $this->log("isLoggedIn", 4);
+        $this->log("isLoggedIn[1]: user ".var_export($this->settings['user'], true), 3);

 
         if ('' == session_id()) {
             $this->startSession();
         }
 
 
         if ('' == session_id()) {
             $this->startSession();
         }
 

+        $this->log("isLoggedIn[2]: user ".var_export($this->settings['user'], true), 3);

         $this->checkSession();
         $this->checkSession();

+        $this->log("isLoggedIn[3]: user ".var_export($this->settings['user'], true), 3);

 
         if (isset($this->settings['user'])) {
             if ($this->settings['user'] != null) {
                 $loggedIn = true;
             } else {
                 if ($CFG->auth_method == 'HTTP_AUTH') {
 
         if (isset($this->settings['user'])) {
             if ($this->settings['user'] != null) {
                 $loggedIn = true;
             } else {
                 if ($CFG->auth_method == 'HTTP_AUTH') {

-                    if (isset($this->server['PHP_AUTH_USER'])) {
-                        $this->settings['user'] = $this->server['PHP_AUTH_USER'];
+                    if (isset($_SERVER['PHP_AUTH_USER'])) {
+                        $this->settings['user'] = $_SERVER['PHP_AUTH_USER'];

                         $loggedIn = true;
                     }
                 }
                         $loggedIn = true;
                     }
                 }