Fix bug in session handler

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

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index 5abc5863eeb71c51ad3a9aea19f93c42b8e8098c..4645e2431c25fc23885d5e9cb59407ad18d7083f 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -75,6 +75,8 @@ class Utils implements Serializable {
     private function startSession() {
         global $CFG;
 
     private function startSession() {
         global $CFG;
 

+        session_unset();
+        session_destroy();

         if (isset($CFG->session_timeout)) {
             $this->timeout = $CFG->session_timeout * 60;
         } else {
         if (isset($CFG->session_timeout)) {
             $this->timeout = $CFG->session_timeout * 60;
         } else {


@@ -94,10 +96,11 @@ class Utils implements Serializable {
     public static function getInstance() {
         global $CFG;
 
     public static function getInstance() {
         global $CFG;
 

+        session_start();

         if (!is_object(self::$_instance)) {
             if (isset($_SESSION['Utils'])) {
                 self::$_instance = unserialize($_SESSION['Utils']);
         if (!is_object(self::$_instance)) {
             if (isset($_SESSION['Utils'])) {
                 self::$_instance = unserialize($_SESSION['Utils']);

-                file_put_contents('/tmp/dump', 'Unserialize called: '.var_export($this, true), FILE_APPEND);
+                file_put_contents('/tmp/dump', 'Unserialize called: '.var_export(self::$_instance, true), FILE_APPEND);

             } else {
                 self::$_instance = new Utils();
             }
             } else {
                 self::$_instance = new Utils();
             }


@@ -107,7 +110,7 @@ class Utils implements Serializable {
         if (isset($_SESSION['LAST_ACTIVITY']) &&
                 ($time - $_SESSION['LAST_ACTIVITY']) >= self::$_instance->timeout) {
             echo 'R_TIME: '.date('c', $time).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']);
         if (isset($_SESSION['LAST_ACTIVITY']) &&
                 ($time - $_SESSION['LAST_ACTIVITY']) >= self::$_instance->timeout) {
             echo 'R_TIME: '.date('c', $time).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']);

-            exit;
+            //exit;

             session_unset();
             session_destroy();
             self::$_instance->user = null;
             session_unset();
             session_destroy();
             self::$_instance->user = null;


@@ -216,7 +219,7 @@ class Utils implements Serializable {
         if ($loggedIn == false) {
             echo '$this->user: '.$this->user.' $_SESSION[\'user\']: '.$_SESSION['user'];
             echo 'R_TIME: '.date('c', $_SERVER['REQUEST_TIME']).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']);
         if ($loggedIn == false) {
             echo '$this->user: '.$this->user.' $_SESSION[\'user\']: '.$_SESSION['user'];
             echo 'R_TIME: '.date('c', $_SERVER['REQUEST_TIME']).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']);

-            exit;
+            //exit;

         }
 
         $_SESSION['Utils'] = serialize($this);
         }
 
         $_SESSION['Utils'] = serialize($this);