X-Git-Url: http://git.datanom.net/qtadmin.git/blobdiff_plain/d6be2d1a0173fe92e69a4312f508b75632936daf..8701688ce44b9ba12b61ec1d3c4d9c5ed2c19f0e:/lib/utils.inc.php?ds=sidebyside
diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index da1cdfb..7ad8969 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,6 +19,7 @@ class Utils {
+
__TITLE__
';
@@ -29,8 +31,6 @@ class Utils {
public function __construct() {
global $CFG;
- $this->log("Init Utils", 4);
-
if (isset($CFG->log_level)) {
$this->log_level = $CFG->log_level;
} else {
@@ -43,16 +43,22 @@ class Utils {
$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;
@@ -67,7 +73,6 @@ class Utils {
return;
$time = date('c');
- $msg = "[$time] $message";
$priority = LOG_INFO;
switch ($level) {
@@ -79,14 +84,30 @@ 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,$msg);
+ syslog($priority, $message);
break;
}
}
private function initSettings() {
+ $this->log("InitSettings", 4);
+
if ('' == session_id()) {
$this->startSession();
}
@@ -98,7 +119,6 @@ class Utils {
}
$this->settings = array(
- 'server' => $_SERVER,
'user' => null,
'admin' => false,
'loginStatus' => 'Not logged in',
@@ -111,6 +131,8 @@ class Utils {
private function startSession() {
global $CFG;
+ $this->log("startSession", 4);
+
if (isset($CFG->session_timeout)) {
$this->timeout = $CFG->session_timeout * 60;
} else {
@@ -119,8 +141,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();
}
@@ -128,6 +151,8 @@ class Utils {
private function checkSession() {
global $CFG;
+ $this->log("checkSession", 4);
+
if ('' == session_id()) {
$this->startSession();
}
@@ -135,7 +160,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;
@@ -143,6 +169,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,
@@ -161,6 +189,8 @@ class Utils {
public function isAdmin() {
$admin = false;
+ $this->log("isAdmin", 4);
+
if (isset($this->settings['admin'])) {
$admin = $this->settings['admin'];
}
@@ -172,6 +202,8 @@ class Utils {
global $CFG;
$result = false;
+ $this->log("login", 4);
+
if ('' == session_id()) {
$this->startSession();
}
@@ -223,6 +255,8 @@ class Utils {
public function getLoginStatus() {
$status = 'Not logged in';
+ $this->log("getLoginStatus", 4);
+
if (isset($this->settings['loginStatus'])) {
$status = $this->settings['loginStatus'];
}
@@ -234,19 +268,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;
}
}
@@ -254,9 +292,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;
@@ -267,6 +304,8 @@ class Utils {
public function getUser() {
$user = null;
+ $this->log("getUser", 4);
+
if ($this->isLoggedIn()) {
$user = $this->settings['user'];
}
@@ -275,20 +314,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);
@@ -297,6 +344,8 @@ class Utils {
}
public function convertContent($code) {
+ $this->log("convertContent", 4);
+
$table = array(
'V' => 'Virus',
'B' => 'Banned',