Fix bug in session handler

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

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index dc6625aa6c0fac784acadf98c8eb3664252ef6dc..4645e2431c25fc23885d5e9cb59407ad18d7083f 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -2,7 +2,7 @@
 /* vim: set ts=4 tw=0 sw=4 noet: */
 require_once $CFG->root .'config.php';
 
-class Utils {
+class Utils implements Serializable {
 
     private static $_instance = null;
     private $server;
@@ -55,13 +55,28 @@ class Utils {
         }
         $_SESSION['user'] = $this->user;
         $_SESSION['is_admin'] = $this->is_admin;
+        $_SESSION['Utils'] = serialize($this);
     }
 
     private function __clone() {}
 
+    public function serialize() {
+        file_put_contents('/tmp/dump', 'Serialize called: '.var_export($this, true), FILE_APPEND);
+        return serialize(get_object_vars($this));
+    }
+
+    public function unserialize($data) {
+        $values = unserialize($data);
+        foreach ($values as $key=>$value) {
+            $this->$key = $value;
+        }
+    }
+
     private function startSession() {
         global $CFG;
 
+        session_unset();
+        session_destroy();
         if (isset($CFG->session_timeout)) {
             $this->timeout = $CFG->session_timeout * 60;
         } else {
@@ -81,19 +96,26 @@ class Utils {
     public static function getInstance() {
         global $CFG;
 
+        session_start();
         if (!is_object(self::$_instance)) {
-            self::$_instance = new Utils();
+            if (isset($_SESSION['Utils'])) {
+                self::$_instance = unserialize($_SESSION['Utils']);
+                file_put_contents('/tmp/dump', 'Unserialize called: '.var_export(self::$_instance, true), FILE_APPEND);
+            } else {
+                self::$_instance = new Utils();
+            }
         }
 
         $time = $_SERVER['REQUEST_TIME'];
         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;
             self::$_instance->is_admin = false;
+            $_SESSION['Utils'] = serialize(self::$_instance);
         } else {
             $_SESSION['LAST_ACTIVITY'] = $time;
         }
@@ -167,6 +189,8 @@ class Utils {
             $this->loginStatus = 'Connect to LDAP server failed';
         }
 
+        $_SESSION['Utils'] = serialize($this);
+
         return $result;
     }
 
@@ -178,7 +202,6 @@ class Utils {
         global $CFG;
         $loggedIn = false;
 
-        echo '$this->user: '.$this->user.' $_SESSION[\'user\']: '.$_SESSION['user'];
         if ($this->user) {
             $loggedIn = true;
         } else if (isset($_SESSION['user'])) {
@@ -194,9 +217,13 @@ class Utils {
         }
 
         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);
+
         return $loggedIn;
     }
 
@@ -225,6 +252,8 @@ class Utils {
         $this->header = str_replace('__TITLE__', $heading, $this->header);
         $this->header = str_replace('__ROOT__', $CFG->wwwroot, $this->header);
         $this->header = str_replace('__TIMEOUT__', $timeout, $this->header);
+
+        $_SESSION['Utils'] = serialize($this);
     }
 
     public function convertContent($code) {