X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/9da61a01903a1595809394cafa1a5517c159bf7d..cdd7c88aefbc8b76b73397292800a0beaa8667b0:/lib/utils.inc.php diff --git a/lib/utils.inc.php b/lib/utils.inc.php index 71f0071..eec51cd 100644 --- a/lib/utils.inc.php +++ b/lib/utils.inc.php @@ -1,6 +1,7 @@ root .'config.php'; +require_once $CFG->root . 'lib/session_handler.inc.php'; class Utils { @@ -18,11 +19,13 @@ class Utils { + __TITLE__ -'; - private $footer = '

Powered by QtAdmin. © 2015 by Michael Rasmussen

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

Session timeout:

__TITLE__

'; @@ -55,8 +58,8 @@ class Utils { $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; @@ -82,7 +85,21 @@ class Utils { 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; @@ -103,7 +120,6 @@ class Utils { } $this->settings = array( - 'server' => $_SERVER, 'user' => null, 'admin' => false, 'loginStatus' => 'Not logged in', @@ -126,8 +142,9 @@ class Utils { 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); + //if (ini_get('session.cookie_lifetime') != $this->timeout) + // ini_set('session.cookie_lifetime', $this->timeout); + ini_set('session.cookie_lifetime', 0); session_start(); } @@ -144,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; @@ -266,8 +284,8 @@ class Utils { $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; } } @@ -275,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; @@ -297,6 +314,19 @@ class Utils { return $user; } + public function authorized($recipient) { + $authorized = false; + + $this->log("authorized '$recipient'", 3); + + if ($this->isAdmin() || $this->getUser() == $recipient) { + $authorized = true; + } + $this->log("authorized '".$this->getUser()."'", 3); + + return $authorized; + } + public function getHeader() { $this->log("getHeader", 4);