X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/339bfa22e495946c5a9a34e6f169186f148be728..60aad80e946dc086047ad7871f4e6d0db41e4777:/lib/utils.inc.php diff --git a/lib/utils.inc.php b/lib/utils.inc.php index fadc397..9c6be9b 100644 --- a/lib/utils.inc.php +++ b/lib/utils.inc.php @@ -1,10 +1,14 @@ root .'config.php'; +require_once $CFG->root . 'lib/session_handler.inc.php'; class Utils { + private $timeout = false; private $settings; + private $log_level; + private $log_method; private $header = ' @@ -15,27 +19,47 @@ class Utils { + __TITLE__ -'; - private $footer = '

Powered by QtAdmin. © 2015 by Michael Rasmussen

'; +
'; + private $footer = '
'; private $heading = '

Session timeout:

__TITLE__

'; public function __construct() { global $CFG; + if (isset($CFG->log_level)) { + $this->log_level = $CFG->log_level; + } else { + $this->log_level = 1; + } + + if (isset($CFG->log_method)) { + $this->log_method = $CFG->log_method; + } else { + $this->log_level = 'syslog'; + } + + $this->log("Init Utils", 4); + + $this->log("__construct[1]: user ".var_export($this->settings['user'], true), 3); $this->startSession(); + $this->log("__construct[2]: user ".var_export($this->settings['user'], true), 3); if (! isset($_SESSION['settings'])) { $this->initSettings(); } + $this->log("__construct[3]: user ".var_export($this->settings['user'], true), 3); $this->settings = $_SESSION['settings']; + $this->log("__construct[4]: user ".var_export($this->settings['user'], true), 3); if ($CFG->auth_method == 'HTTP_AUTH') { - if (isset($this->server['PHP_AUTH_USER'])) { - $this->settings['user'] = $this->server['PHP_AUTH_USER']; + if (isset($_SERVER['PHP_AUTH_USER'])) { + $this->settings['user'] = $_SERVER['PHP_AUTH_USER']; $this->settings['loginStatus'] = 'OK'; if ($CFG->admin_user == $this->settings['user']) $this->settings['admin'] = true; @@ -43,17 +67,63 @@ class Utils { } } + private function log($message, $level = 1) { + global $CFG; + + if ($level > $this->log_level) + return; + + $time = date('c'); + + $priority = LOG_INFO; + switch ($level) { + case 1: $priority = LOG_ERR; break; + case 2: $priority = LOG_WARNING; break; + case 3: $priority = LOG_INFO; break; + case 4: $priority = LOG_DEBUG; break; + } + + switch ($this->log_method) { + case 'file': + if (isset($CFG->log_file)) { + if ($CFG->log_file[0] == '/') { + $file = $CFG->log_file; + } else { + $file = $CFG->root.$CFG->log_file; + } + } else { + $file = $CFG->root.'qtadmin.log'; + } + file_put_contents($file, "[$time]: $message\n", FILE_APPEND | LOCK_EX); + chmod($file, 0600); + break; + case 'stderr': + file_put_contents('php://stderr', "[$time]: $message\n"); + break; + case 'syslog': + syslog($priority, $message); + break; + } + } + private function initSettings() { + $this->log("InitSettings", 4); + if ('' == session_id()) { $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; @@ -62,18 +132,19 @@ class Utils { private function startSession() { global $CFG; + $this->log("startSession", 4); + 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); + ini_set('session.cookie_lifetime', 0); session_start(); } @@ -81,6 +152,8 @@ class Utils { private function checkSession() { global $CFG; + $this->log("checkSession", 4); + if ('' == session_id()) { $this->startSession(); } @@ -88,7 +161,8 @@ class Utils { $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->log('R_TIME: '.date('c', $time).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']. + 'Test: '.($time - $_SESSION['LAST_ACTIVITY'])).' >= '.$this->settings['timeout'], 3); $this->logout(); } else { $_SESSION['LAST_ACTIVITY'] = $time; @@ -96,6 +170,8 @@ class Utils { } public function logout() { + $this->log("logout", 4); + if (ini_get('session.use_cookies')) { $params = session_get_cookie_params(); setcookie(session_name(), '', time() - 42000, @@ -114,6 +190,8 @@ class Utils { public function isAdmin() { $admin = false; + $this->log("isAdmin", 4); + if (isset($this->settings['admin'])) { $admin = $this->settings['admin']; } @@ -125,6 +203,8 @@ class Utils { global $CFG; $result = false; + $this->log("login", 4); + if ('' == session_id()) { $this->startSession(); } @@ -176,6 +256,8 @@ class Utils { public function getLoginStatus() { $status = 'Not logged in'; + $this->log("getLoginStatus", 4); + if (isset($this->settings['loginStatus'])) { $status = $this->settings['loginStatus']; } @@ -187,19 +269,23 @@ class Utils { global $CFG; $loggedIn = false; + $this->log("isLoggedIn[1]: user ".var_export($this->settings['user'], true), 3); + if ('' == session_id()) { $this->startSession(); } + $this->log("isLoggedIn[2]: user ".var_export($this->settings['user'], true), 3); $this->checkSession(); + $this->log("isLoggedIn[3]: user ".var_export($this->settings['user'], true), 3); 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']; + if (isset($_SERVER['PHP_AUTH_USER'])) { + $this->settings['user'] = $_SERVER['PHP_AUTH_USER']; $loggedIn = true; } } @@ -207,9 +293,8 @@ class Utils { } 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; + $this->log('$this->settings: '.var_export($this->settings, true), 3); + $this->log('R_TIME: '.date('c', $_SERVER['REQUEST_TIME']).' L_ACT: '.date('c', $_SESSION['LAST_ACTIVITY']), 3); } $_SESSION['settings'] = $this->settings; @@ -220,6 +305,8 @@ class Utils { public function getUser() { $user = null; + $this->log("getUser", 4); + if ($this->isLoggedIn()) { $user = $this->settings['user']; } @@ -228,20 +315,28 @@ class Utils { } public function getHeader() { + $this->log("getHeader", 4); + return $this->header; } public function getFooter() { + $this->log("getFooter", 4); + return $this->footer; } public function getHeading() { + $this->log("getHeading", 4); + return $this->heading; } public function setHeading($heading) { global $CFG; + $this->log("setHeading", 4); + $timeout = $CFG->session_timeout * 60 * 1000; $this->heading = str_replace('__TITLE__', $heading, $this->heading); $this->header = str_replace('__TITLE__', $heading, $this->header); @@ -250,6 +345,8 @@ class Utils { } public function convertContent($code) { + $this->log("convertContent", 4); + $table = array( 'V' => 'Virus', 'B' => 'Banned',