X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/3056d1173b4c0225eea764cd1bdfae965b198c14..2b6294e98ee9d3365f8a73e0875781158ed8209e:/lib/utils.inc.php diff --git a/lib/utils.inc.php b/lib/utils.inc.php index be2ccf9..640d828 100644 --- a/lib/utils.inc.php +++ b/lib/utils.inc.php @@ -4,6 +4,7 @@ require_once $CFG->root .'config.php'; class Utils { + private $timeout = false; private $settings; private $header = ' @@ -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; @@ -79,6 +86,10 @@ class Utils { private function checkSession() { global $CFG; + if ('' == session_id()) { + $this->startSession(); + } + $time = $_SERVER['REQUEST_TIME']; if (isset($_SESSION['LAST_ACTIVITY']) && ($time - $_SESSION['LAST_ACTIVITY']) >= $this->settings['timeout']) { @@ -90,15 +101,18 @@ class Utils { } public function logout() { - $_SESSION = array(); if (ini_get('session.use_cookies')) { $params = session_get_cookie_params(); setcookie(session_name(), '', time() - 42000, $params['path'], $params['domain'], $params['secure'], $params['httponly']); } - session_unset(); - session_destroy(); + + if ('' != session_id()) { + $_SESSION = array(); + session_unset(); + session_destroy(); + } $this->settings = array(); } @@ -182,6 +196,8 @@ class Utils { $this->startSession(); } + $this->checkSession(); + if (isset($this->settings['user'])) { if ($this->settings['user'] != null) { $loggedIn = true; @@ -196,7 +212,7 @@ class Utils { } if ($loggedIn == false) { - echo '$this->user: '.$this->user.' $_SESSION[\'user\']: '.$_SESSION['user']; + echo '$this->settings: '.var_export($this->settings, true); echo 'R_TIME: '.date('c', $_SERVER['REQUEST_TIME']).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']); //exit; }