Add check for valid session

[qtadmin.git] / lib / utils.inc.php
diff --git a/lib/utils.inc.php b/lib/utils.inc.php

index fadc39717c3626343508d9929cd1461388c1f6b8..ec109f82c6f63ef82434e451bdfdbb3b7b007329 100644 (file)
--- a/lib/utils.inc.php
+++ b/lib/utils.inc.php
@@ -4,7 +4,10 @@ require_once $CFG->root .'config.php';
  
  class Utils {
  
+    private $timeout = false;
      private $settings;
+    private $log_level;
+    private $log_method;
      private $header = '<!DOCTYPE html>
  <html>
  <head>
@@ -26,6 +29,20 @@ class Utils {
      public function __construct() {
          global $CFG;
  
+        $this->log("Init Utils", 4);
+
+        if (isset($CFG->log_level)) {
+            $this->log_level = $CFG->log_level;
+        } else {
+            $this->log_level = 1;
+        }
+
+        if (isset($CFG->log_method)) {
+            $this->log_method = $CFG->log_method;
+        } else {
+            $this->log_level = 'syslog';
+        }
+
          $this->startSession();
  
          if (! isset($_SESSION['settings'])) {
@@ -43,17 +60,48 @@ class Utils {
          }
      }
  
+    private function log($message, $level = 1) {
+        global $CFG;
+
+        if ($level > $this->log_level)
+            return;
+
+        $time = date('c');
+        $msg = "[$time] $message";
+
+        $priority = LOG_INFO;
+        switch ($level) {
+            case 1: $priority = LOG_ERR; break;
+            case 2: $priority = LOG_WARNING; break;
+            case 3: $priority = LOG_INFO; break;
+            case 4: $priority = LOG_DEBUG; break;
+        }
+
+        switch ($this->log_method) {
+            case 'file':
+            case 'stderr':
+            case 'syslog':
+                syslog($priority,$msg);
+                break;
+    }
+
      private function initSettings() {
          if ('' == session_id()) {
              $this->startSession();
          }
  
+        if (false !== $this->timeout) {
+            $timeout = $this->timeout;
+        } else {
+            $timeout = 0;
+        }
+
          $this->settings = array(
              'server' => $_SERVER,
              'user' => null,
              'admin' => false,
              'loginStatus' => 'Not logged in',
-            'timeout' => 0
+            'timeout' => $timeout
          );
  
          $_SESSION['settings'] = $this->settings;
@@ -63,17 +111,15 @@ class Utils {
          global $CFG;
  
          if (isset($CFG->session_timeout)) {
-            $this->settings['timeout'] = $CFG->session_timeout * 60;
+            $this->timeout = $CFG->session_timeout * 60;
          } else {
-            $this->settings['timeout'] = 20 * 60;
+            $this->timeout = 20 * 60;
          }
  
-        if (ini_get('session.gc_maxlifetime') != $this->settings['timeout'])
-            ini_set('session.gc_maxlifetime', $this->settings['timeout']);
-        if (ini_get('session.cookie_lifetime') != $this->settings['timeout'])
-            ini_set('session.cookie_lifetime', $this->settings['timeout']);
-
-        $_SESSION['settings'] = $this->settings;
+        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);
  
          session_start();
      }