Add check for valid session

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index 6dd47605f242aa2052b56fb464156ef59d0afb27..c06729f7e023dbe7dd73bc2dbd174121337e0107 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -67,7 +67,6 @@ class Utils {
             return;
 
         $time = date('c');
-        $msg = "[$time] $message";
 
         $priority = LOG_INFO;
         switch ($level) {
@@ -81,12 +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();
         }
@@ -111,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 {
@@ -128,6 +131,8 @@ class Utils {
     private function checkSession() {
         global $CFG;
 
+        $this->log("checkSession", 4);
+
         if ('' == session_id()) {
             $this->startSession();
         }
@@ -143,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,
@@ -161,6 +168,8 @@ class Utils {
     public function isAdmin() {
         $admin = false;
 
+        $this->log("isAdmin", 4);
+
         if (isset($this->settings['admin'])) {
             $admin = $this->settings['admin'];
         }
@@ -172,6 +181,8 @@ class Utils {
         global $CFG;
         $result = false;
 
+        $this->log("login", 4);
+
         if ('' == session_id()) {
             $this->startSession();
         }
@@ -223,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'];
         }
@@ -234,6 +247,8 @@ class Utils {
         global $CFG;
         $loggedIn = false;
 
+        $this->log("isLoggedIn", 4);
+
         if ('' == session_id()) {
             $this->startSession();
         }
@@ -267,6 +282,8 @@ class Utils {
     public function getUser() {
         $user = null;
 
+        $this->log("getUser", 4);
+
         if ($this->isLoggedIn()) {
             $user = $this->settings['user'];
         }
@@ -275,20 +292,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 +322,8 @@ class Utils {
     }
 
     public function convertContent($code) {
+        $this->log("convertContent", 4);
+
         $table = array(
             'V' => 'Virus',
             'B' => 'Banned',