Add check for valid session

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

diff --git a/lib/utils.inc.php b/lib/utils.inc.php
index da1cdfb3d42430a6486a6a196c046d507bc60110..3c3ff9765ef75cbee3488fde2fd875cd3446352d 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -29,8 +29,6 @@ class Utils {
     public function __construct() {
         global $CFG;
 
     public function __construct() {
         global $CFG;
 

-        $this->log("Init Utils", 4);
-

         if (isset($CFG->log_level)) {
             $this->log_level = $CFG->log_level;
         } else {
         if (isset($CFG->log_level)) {
             $this->log_level = $CFG->log_level;
         } else {


@@ -43,16 +41,22 @@ class Utils {
             $this->log_level = 'syslog';
         }
 
             $this->log_level = 'syslog';
         }
 

+        $this->log("Init Utils", 4);
+
+        $this->log("__construct[1]: user ".var_export($this->settings['user'], true), 3);

         $this->startSession();
         $this->startSession();

+        $this->log("__construct[2]: user ".var_export($this->settings['user'], true), 3);

 
         if (! isset($_SESSION['settings'])) {
             $this->initSettings();
         }
 
         if (! isset($_SESSION['settings'])) {
             $this->initSettings();
         }

+        $this->log("__construct[3]: user ".var_export($this->settings['user'], true), 3);

         $this->settings = $_SESSION['settings'];
         $this->settings = $_SESSION['settings'];

+        $this->log("__construct[4]: user ".var_export($this->settings['user'], true), 3);

 
         if ($CFG->auth_method == 'HTTP_AUTH') {
 
         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;
                 $this->settings['loginStatus'] = 'OK';
                 if ($CFG->admin_user == $this->settings['user'])
                     $this->settings['admin'] = true;


@@ -67,7 +71,6 @@ class Utils {
             return;
 
         $time = date('c');
             return;
 
         $time = date('c');

-        $msg = "[$time] $message";

 
         $priority = LOG_INFO;
         switch ($level) {
 
         $priority = LOG_INFO;
         switch ($level) {


@@ -81,12 +84,14 @@ class Utils {
             case 'file':
             case 'stderr':
             case 'syslog':
             case 'file':
             case 'stderr':
             case 'syslog':

-                syslog($priority,$msg);
+                syslog($priority, $message);

                 break;
         }
     }
 
     private function initSettings() {
                 break;
         }
     }
 
     private function initSettings() {

+        $this->log("InitSettings", 4);
+

         if ('' == session_id()) {
             $this->startSession();
         }
         if ('' == session_id()) {
             $this->startSession();
         }


@@ -98,7 +103,6 @@ class Utils {
         }
 
         $this->settings = array(
         }
 
         $this->settings = array(

-            'server' => $_SERVER,

             'user' => null,
             'admin' => false,
             'loginStatus' => 'Not logged in',
             'user' => null,
             'admin' => false,
             'loginStatus' => 'Not logged in',


@@ -111,6 +115,8 @@ class Utils {
     private function startSession() {
         global $CFG;
 
     private function startSession() {
         global $CFG;
 

+        $this->log("startSession", 4);
+

         if (isset($CFG->session_timeout)) {
             $this->timeout = $CFG->session_timeout * 60;
         } else {
         if (isset($CFG->session_timeout)) {
             $this->timeout = $CFG->session_timeout * 60;
         } else {


@@ -128,6 +134,8 @@ class Utils {
     private function checkSession() {
         global $CFG;
 
     private function checkSession() {
         global $CFG;
 

+        $this->log("checkSession", 4);
+

         if ('' == session_id()) {
             $this->startSession();
         }
         if ('' == session_id()) {
             $this->startSession();
         }


@@ -143,6 +151,8 @@ class Utils {
     }
 
     public function logout() {
     }
 
     public function logout() {

+        $this->log("logout", 4);
+

         if (ini_get('session.use_cookies')) {
             $params = session_get_cookie_params();
             setcookie(session_name(), '', time() - 42000,
         if (ini_get('session.use_cookies')) {
             $params = session_get_cookie_params();
             setcookie(session_name(), '', time() - 42000,


@@ -161,6 +171,8 @@ class Utils {
     public function isAdmin() {
         $admin = false;
 
     public function isAdmin() {
         $admin = false;
 

+        $this->log("isAdmin", 4);
+

         if (isset($this->settings['admin'])) {
             $admin = $this->settings['admin'];
         }
         if (isset($this->settings['admin'])) {
             $admin = $this->settings['admin'];
         }


@@ -172,6 +184,8 @@ class Utils {
         global $CFG;
         $result = false;
 
         global $CFG;
         $result = false;
 

+        $this->log("login", 4);
+

         if ('' == session_id()) {
             $this->startSession();
         }
         if ('' == session_id()) {
             $this->startSession();
         }


@@ -223,6 +237,8 @@ class Utils {
     public function getLoginStatus() {
         $status = 'Not logged in';
 
     public function getLoginStatus() {
         $status = 'Not logged in';
 

+        $this->log("getLoginStatus", 4);
+

         if (isset($this->settings['loginStatus'])) {
             $status = $this->settings['loginStatus'];
         }
         if (isset($this->settings['loginStatus'])) {
             $status = $this->settings['loginStatus'];
         }


@@ -234,19 +250,23 @@ class Utils {
         global $CFG;
         $loggedIn = false;
 
         global $CFG;
         $loggedIn = false;
 

+        $this->log("isLoggedIn[1]: user ".var_export($this->settings['user'], true), 3);
+

         if ('' == session_id()) {
             $this->startSession();
         }
 
         if ('' == session_id()) {
             $this->startSession();
         }
 

+        $this->log("isLoggedIn[2]: user ".var_export($this->settings['user'], true), 3);

         $this->checkSession();
         $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->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;
                     }
                 }
                         $loggedIn = true;
                     }
                 }


@@ -267,6 +287,8 @@ class Utils {
     public function getUser() {
         $user = null;
 
     public function getUser() {
         $user = null;
 

+        $this->log("getUser", 4);
+

         if ($this->isLoggedIn()) {
             $user = $this->settings['user'];
         }
         if ($this->isLoggedIn()) {
             $user = $this->settings['user'];
         }


@@ -275,20 +297,28 @@ class Utils {
     }
 
     public function getHeader() {
     }
 
     public function getHeader() {

+        $this->log("getHeader", 4);
+

         return $this->header;
     }
 
     public function getFooter() {
         return $this->header;
     }
 
     public function getFooter() {

+        $this->log("getFooter", 4);
+

         return $this->footer;
     }
 
     public function getHeading() {
         return $this->footer;
     }
 
     public function getHeading() {

+        $this->log("getHeading", 4);
+

         return $this->heading;
     }
 
     public function setHeading($heading) {
         global $CFG;
 
         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);
         $timeout = $CFG->session_timeout * 60 * 1000;
         $this->heading = str_replace('__TITLE__', $heading, $this->heading);
         $this->header = str_replace('__TITLE__', $heading, $this->header);


@@ -297,6 +327,8 @@ class Utils {
     }
 
     public function convertContent($code) {
     }
 
     public function convertContent($code) {

+        $this->log("convertContent", 4);
+

         $table = array(
             'V' => 'Virus',
             'B' => 'Banned',
         $table = array(
             'V' => 'Virus',
             'B' => 'Banned',