Add check for valid session

[qtadmin.git] / lib / utils.inc.php

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index ec109f82c6f63ef82434e451bdfdbb3b7b007329..5c3a0cd28eb5bcc280a95c674bcdd54ff13b4773 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -29,8 +29,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,6 +41,8 @@ class Utils {
             $this->log_level = 'syslog';
         }
 
+        $this->log("Init Utils", 4);
+
         $this->startSession();
 
         if (! isset($_SESSION['settings'])) {
@@ -67,7 +67,6 @@ class Utils {
             return;
 
         $time = date('c');
-        $msg = "[$time] $message";
 
         $priority = LOG_INFO;
         switch ($level) {
@@ -81,11 +80,14 @@ class Utils {
             case 'file':
             case 'stderr':
             case 'syslog':
-                syslog($priority,$msg);
+                syslog($priority, $message);
                 break;
+        }
     }
 
     private function initSettings() {
+        $this->log("InitSettings", 4);
+
         if ('' == session_id()) {
             $this->startSession();
         }
@@ -110,6 +112,8 @@ class Utils {
     private function startSession() {
         global $CFG;
 
+        $this->log("startSession", 4);
+
         if (isset($CFG->session_timeout)) {
             $this->timeout = $CFG->session_timeout * 60;
         } else {
@@ -127,6 +131,8 @@ class Utils {
     private function checkSession() {
         global $CFG;
 
+        $this->log("checkSession", 4);
+
         if ('' == session_id()) {
             $this->startSession();
         }
@@ -142,6 +148,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,
@@ -160,6 +168,8 @@ class Utils {
     public function isAdmin() {
         $admin = false;
 
+        $this->log("isAdmin", 4);
+
         if (isset($this->settings['admin'])) {
             $admin = $this->settings['admin'];
         }
@@ -171,6 +181,8 @@ class Utils {
         global $CFG;
         $result = false;
 
+        $this->log("login", 4);
+
         if ('' == session_id()) {
             $this->startSession();
         }
@@ -222,6 +234,8 @@ class Utils {
     public function getLoginStatus() {
         $status = 'Not logged in';
 
+        $this->log("getLoginStatus", 4);
+
         if (isset($this->settings['loginStatus'])) {
             $status = $this->settings['loginStatus'];
         }
@@ -233,11 +247,15 @@ class Utils {
         global $CFG;
         $loggedIn = false;
 
+        $this->log("isLoggedIn[1]\n".var_export($this->settings, true), 3);
+
         if ('' == session_id()) {
             $this->startSession();
         }
 
+        $this->log("isLoggedIn[2]\n".var_export($this->settings, true), 3);
         $this->checkSession();
+        $this->log("isLoggedIn[3]\n".var_export($this->settings, true), 3);
 
         if (isset($this->settings['user'])) {
             if ($this->settings['user'] != null) {
@@ -266,6 +284,8 @@ class Utils {
     public function getUser() {
         $user = null;
 
+        $this->log("getUser", 4);
+
         if ($this->isLoggedIn()) {
             $user = $this->settings['user'];
         }
@@ -274,20 +294,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);
@@ -296,6 +324,8 @@ class Utils {
     }
 
     public function convertContent($code) {
+        $this->log("convertContent", 4);
+
         $table = array(
             'V' => 'Virus',
             'B' => 'Banned',