From 2b6294e98ee9d3365f8a73e0875781158ed8209e Mon Sep 17 00:00:00 2001 From: Michael Rasmussen Date: Fri, 5 Jun 2015 21:11:32 +0200 Subject: [PATCH] Add check for valid session --- lib/utils.inc.php | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/utils.inc.php b/lib/utils.inc.php index fadc397..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; @@ -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(); } -- 2.39.2