]> git.datanom.net - qtadmin.git/commitdiff
Add check for valid session
authorMichael Rasmussen <mir@datanom.net>
Fri, 5 Jun 2015 19:11:32 +0000 (21:11 +0200)
committerMichael Rasmussen <mir@datanom.net>
Fri, 5 Jun 2015 19:11:32 +0000 (21:11 +0200)
lib/utils.inc.php

index fadc39717c3626343508d9929cd1461388c1f6b8..640d828edfffedf540804b91d052ace2d6284489 100644 (file)
@@ -4,6 +4,7 @@ require_once $CFG->root .'config.php';
 
 class Utils {
 
+    private $timeout = false;
     private $settings;
     private $header = '<!DOCTYPE html>
 <html>
@@ -48,12 +49,18 @@ class Utils {
             $this->startSession();
         }
 
+        if (false !== $this->timeout) {
+            $timeout = $this->timeout;
+        } else {
+            $timeout = 0;
+        }
+
         $this->settings = array(
             'server' => $_SERVER,
             'user' => null,
             'admin' => false,
             'loginStatus' => 'Not logged in',
-            'timeout' => 0
+            'timeout' => $timeout
         );
 
         $_SESSION['settings'] = $this->settings;
@@ -63,17 +70,15 @@ class Utils {
         global $CFG;
 
         if (isset($CFG->session_timeout)) {
-            $this->settings['timeout'] = $CFG->session_timeout * 60;
+            $this->timeout = $CFG->session_timeout * 60;
         } else {
-            $this->settings['timeout'] = 20 * 60;
+            $this->timeout = 20 * 60;
         }
 
-        if (ini_get('session.gc_maxlifetime') != $this->settings['timeout'])
-            ini_set('session.gc_maxlifetime', $this->settings['timeout']);
-        if (ini_get('session.cookie_lifetime') != $this->settings['timeout'])
-            ini_set('session.cookie_lifetime', $this->settings['timeout']);
-
-        $_SESSION['settings'] = $this->settings;
+        if (ini_get('session.gc_maxlifetime') != $this->timeout)
+            ini_set('session.gc_maxlifetime', $this->timeout);
+        if (ini_get('session.cookie_lifetime') != $this->timeout)
+            ini_set('session.cookie_lifetime', $this->timeout);
 
         session_start();
     }
This page took 0.032776 seconds and 5 git commands to generate.