Fix bug in session handler

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

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index 723a133080e51f2d0a915200edd928c062945a61..c90b98bfb89b32a22fb6da9303b8dd0c51fff11e 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();
             }


@@ -110,7 +113,7 @@ class Utils implements Serializable {
             exit;
             session_unset();
             session_destroy();
             exit;
             session_unset();
             session_destroy();

-            self::$_instance = null;
+            self::$_instance->user = null;

             self::$_instance->is_admin = false;
             $_SESSION['Utils'] = serialize(self::$_instance);
         } else {
             self::$_instance->is_admin = false;
             $_SESSION['Utils'] = serialize(self::$_instance);
         } else {