X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/b95d1cdbc4fe25e3f0df3b94e990f6af7b330c63..258fa28078d7d6c2fc52743fc93beeef2ef41078:/lib/utils.inc.php?ds=sidebyside diff --git a/lib/utils.inc.php b/lib/utils.inc.php index 2f1671d..d61b9e7 100644 --- a/lib/utils.inc.php +++ b/lib/utils.inc.php @@ -4,11 +4,7 @@ require_once $CFG->root .'config.php'; class Utils { - private static $_instance = null; - private $server; - private $user; - private $is_admin; - private $loginStatus; + private $settings; private $header = ' @@ -18,173 +14,215 @@ class Utils { var timeout = __TIMEOUT__; + __TITLE__ '; - private $footer = '

Powered by - QtAdmin. © 2015 by Michael Rasmussen

'; + private $footer = '

Powered by QtAdmin. © 2015 by Michael Rasmussen

'; private $heading = '

Session timeout:

__TITLE__

'; - private function __construct() { + public function __construct() { global $CFG; - $this->server = $_SERVER; - session_start(); + $this->startSession(); - $this->user = null; - $this->is_admin = false; - $this->loginStatus = 'Not logged in'; + if (! isset($_SESSION['settings'])) { + $this->initSettings(); + } + $this->settings = $_SESSION['settings']; - if (isset($_SESSION['user'])) { - $this->user = $_SESSION['user']; - $this->loginStatus = 'OK'; - $this->is_admin = $_SESSION['is_admin']; - } else { - if ($CFG->auth_method == 'HTTP_AUTH') { - if (isset($this->server['PHP_AUTH_USER'])) { - $this->user = $this->server['PHP_AUTH_USER']; - $this->loginStatus = 'OK'; - if ($CFG->admin_user == $this->user) - $this->is_admin = true; - } + if ($CFG->auth_method == 'HTTP_AUTH') { + if (isset($this->server['PHP_AUTH_USER'])) { + $this->settings['user'] = $this->server['PHP_AUTH_USER']; + $this->settings['loginStatus'] = 'OK'; + if ($CFG->admin_user == $this->settings['user']) + $this->settings['admin'] = true; } } - $_SESSION['user'] = $this->user; - $_SESSION['is_admin'] = $this->is_admin; } - private function __clone() {} + private function initSettings() { + if ('' == session_id()) { + $this->startSession(); + } + + $this->settings = array( + 'server' => $_SERVER, + 'user' => null, + 'admin' => false, + 'loginStatus' => 'Not logged in', + 'timeout' => 0 + ); - public static function getInstance() { + $_SESSION['settings'] = $this->settings; + } + + private function startSession() { global $CFG; - if (!is_object(self::$_instance)) { - self::$_instance = new Utils(); - } - // Session timeout handler - if ('' == session_id()) - session_start(); if (isset($CFG->session_timeout)) { - $timeout = $CFG->session_timeout * 60; + $this->timeout = $CFG->session_timeout * 60; } else { - $timeout = 20 * 60; + $this->timeout = 20 * 60; } - if (ini_get('session.gc_maxlifetime') != $timeout) - ini_set('session.gc_maxlifetime', $timeout); - if (ini_get('session.cookie_lifetime') != $timeout) - ini_set('session.cookie_lifetime', $timeout); - $time = $_SERVER['REQUEST_TIME']; - if (isset($_SESSION['LAST_ACTIVITY']) && ($time - $_SESSION['LAST_ACTIVITY']) >= $timeout) { - session_unset(); - session_destroy(); - session_start(); - self::$_instance->user = null; - self::$_instance->is_admin = false; + 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(); + } + + private function checkSession() { + global $CFG; + + if ('' == session_id()) { + $this->startSession(); } - $_SESSION['LAST_ACTIVITY'] = $time; - return self::$_instance; + $time = $_SERVER['REQUEST_TIME']; + if (isset($_SESSION['LAST_ACTIVITY']) && + ($time - $_SESSION['LAST_ACTIVITY']) >= $this->settings['timeout']) { + echo 'R_TIME: '.date('c', $time).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']); + $this->logout(); + } else { + $_SESSION['LAST_ACTIVITY'] = $time; + } } 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(); - $this->user = null; - $this->is_admin = false; + + if ('' != session_id()) { + $_SESSION = array(); + session_unset(); + session_destroy(); + } + $this->settings = array(); } public function isAdmin() { - //file_put_contents('/tmp/login.txt', var_export($this, true)); - return $this->is_admin; + $admin = false; + + if (isset($this->settings['admin'])) { + $admin = $this->settings['admin']; + } + + return $admin; } public function login($user, $pw) { global $CFG; $result = false; - unset($_SESSION['user']); - unset($_SESSION['is_admin']); - $this->user = null; - $this->is_admin = false; + if ('' == session_id()) { + $this->startSession(); + } + + $this->settings['user'] = null; + $this->settings['admin'] = false; $p = explode('@', $user); if (count($p) != 2) { - $this->loginStatus = 'Bad username'; - return false; - } - $domain = $p[1]; - $dn = "mail=$user,ou=Users,domainName=$domain,$CFG->ldap_base_dn"; - $filter = "(&(objectclass=mailUser)(accountStatus=active)(mail=$user))"; - $ds = @ldap_connect($CFG->ldap_dsn); - if ($ds) { - @ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3); - $r = @ldap_bind($ds, $dn, $pw); - if ($r) { - $sr = @ldap_search($ds, $CFG->ldap_base_dn, $filter, array('mail','domainglobaladmin')); - $info = @ldap_get_entries($ds, $sr); // array - if ($info['count'] > 0) { - $_SESSION['user'] = $user; - $this->user = $user; - $result = true; - $this->loginStatus = 'OK'; - $admin = 'NO'; - if (isset($info[0]['domainglobaladmin'])) { - $admin = $info[0]['domainglobaladmin'][0]; - $admin = strtoupper($admin); + $this->settings['loginStatus'] = 'Bad username'; + } else { + $domain = $p[1]; + $dn = "mail=$user,ou=Users,domainName=$domain,$CFG->ldap_base_dn"; + $filter = "(&(objectclass=mailUser)(accountStatus=active)(mail=$user))"; + $ds = @ldap_connect($CFG->ldap_dsn); + if ($ds) { + @ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3); + $r = @ldap_bind($ds, $dn, $pw); + if ($r) { + $sr = @ldap_search($ds, $CFG->ldap_base_dn, $filter, array('mail','domainglobaladmin')); + $info = @ldap_get_entries($ds, $sr); // array + if ($info['count'] > 0) { + $this->settings['user'] = $user; + $result = true; + $this->settings['loginStatus'] = 'OK'; + $admin = 'NO'; + if (isset($info[0]['domainglobaladmin'])) { + $admin = $info[0]['domainglobaladmin'][0]; + $admin = strtoupper($admin); + } + $this->settings['admin'] = ($admin == 'YES') ? true : false; + } else { + $this->settings['loginStatus'] = 'Login failed'; } - $this->is_admin = ($admin == 'YES') ? true : false; - $_SESSION['is_admin'] = $this->is_admin; } else { - $this->loginStatus = 'Login failed'; + $this->settings['loginStatus'] = ldap_error($ds); } + @ldap_close($ds); } else { - $this->loginStatus = ldap_error($ds); + $this->settings['loginStatus'] = 'Connect to LDAP server failed'; } - @ldap_close($ds); - } else { - $this->loginStatus = 'Connect to LDAP server failed'; } + $_SESSION['settings'] = $this->settings; + return $result; } public function getLoginStatus() { - return $this->loginStatus; + $status = 'Not logged in'; + + if (isset($this->settings['loginStatus'])) { + $status = $this->settings['loginStatus']; + } + + return $status; } public function isLoggedIn() { global $CFG; $loggedIn = false; - if ($this->user) { - $loggedIn = true; - } else if (isset($_SESSION['user'])) { - $this->user = $_SESSION['user']; - $loggedIn = true; - } else { - if ($CFG->auth_method == 'HTTP_AUTH') { - if (isset($this->server['PHP_AUTH_USER'])) { - $this->user = $this->server['PHP_AUTH_USER']; - $loggedIn = true; + if ('' == session_id()) { + $this->startSession(); + } + + $this->checkSession(); + + if (isset($this->settings['user'])) { + if ($this->settings['user'] != null) { + $loggedIn = true; + } else { + if ($CFG->auth_method == 'HTTP_AUTH') { + if (isset($this->server['PHP_AUTH_USER'])) { + $this->settings['user'] = $this->server['PHP_AUTH_USER']; + $loggedIn = true; + } } } } + if ($loggedIn == false) { + echo '$this->settings: '.var_export($this->settings, true); + echo 'R_TIME: '.date('c', $_SERVER['REQUEST_TIME']).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']); + //exit; + } + + $_SESSION['settings'] = $this->settings; + return $loggedIn; } public function getUser() { - $this->isLoggedIn(); - return $this->user; + $user = null; + + if ($this->isLoggedIn()) { + $user = $this->settings['user']; + } + + return $user; } public function getHeader() {