From 8b5ccd302bd1497de721a25e4ce086bebf95173f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 08 Jun 2008 15:32:42 -0400
Subject: [PATCH] Fixed a problem with the logout when the php session has ended.
---
server/lib/app.inc.php | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 1394b1e..e8e9b93 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -28,8 +28,11 @@
*/
class app {
-
- function app() {
+
+ var $loaded_modules = array();
+ var $loaded_plugins = array();
+
+ function app() {
global $conf;
@@ -56,18 +59,19 @@
}
}
- function load($files) {
+ function load($classes) {
- global $conf;
- $fl = explode(',',$files);
- if(is_array($fl)) {
- foreach($fl as $file) {
- if(is_file($conf['classpath'] . "/".$classname.".inc.php") && !is_link($conf['classpath'] . "/".$classname.".inc.php")) {
- include_once($conf['classpath'] . "/".$file.".inc.php");
- }
- }
- }
-
+ global $conf;
+ $cl = explode(',',$classes);
+ if(is_array($cl)) {
+ foreach($cl as $classname) {
+ if(is_file($conf['classpath'] . "/".$classname.".inc.php") && !is_link($conf['classpath'] . "/".$classname.".inc.php")) {
+ include_once($conf['classpath'] . "/".$classname.".inc.php");
+ } else {
+ die('Unable to load: '.$conf['classpath'] . "/".$classname.".inc.php");
+ }
+ }
+ }
}
/*
@@ -81,19 +85,18 @@
global $conf;
if($priority >= $conf["log_priority"]) {
- if (is_writable($conf["log_file"])) {
-
+ //if (is_writable($conf["log_file"])) {
if (!$fp = fopen ($conf["log_file"], "a")) {
die("Unable to open Logfile.");
}
switch ($priority) {
- case: 0;
+ case 0:
$priority_txt = "DEBUG";
break;
- case: 1;
+ case 1:
$priority_txt = "WARNING";
break;
- case: 2;
+ case 2:
$priority_txt = "ERROR";
break;
}
@@ -101,11 +104,12 @@
if (!fwrite($fp, date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."\r\n")) {
die("Unable to write to logfile.");
}
+ echo date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."<br>\n";
fclose($fp);
- } else {
- $this->error("Logfile ist nicht beschreibbar.");
- }
+ //} else {
+ // die("Unable to write to logfile.");
+ //}
} // if
} // func
@@ -117,7 +121,7 @@
function error($msg) {
$this->log($msg,3);
- die();
+ die($msg);
}
}
--
Gitblit v1.9.1