Commit 06b7fa91 authored by jwarnier's avatar jwarnier
Browse files

- fix indentation

- replace double-quotes with single-quotes whenever appropriate
parent 5f027cd0
...@@ -30,10 +30,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ...@@ -30,10 +30,10 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
class app { class app {
var $loaded_modules = array(); var $loaded_modules = array();
var $loaded_plugins = array(); var $loaded_plugins = array();
function app() { function app() {
global $conf; global $conf;
...@@ -68,34 +68,36 @@ class app { ...@@ -68,34 +68,36 @@ class app {
} }
function uses($classes) { function uses($classes) {
global $conf;
global $conf;
$cl = explode(',',$classes);
if(is_array($cl)) { $cl = explode(',',$classes);
foreach($cl as $classname) { if(is_array($cl)) {
if(!@is_object($this->$classname)) { foreach($cl as $classname) {
if(is_file($conf['classpath'] . '/'.$classname.'.inc.php') && !is_link($conf['classpath'] . '/'.$classname.'.inc.php')) { if(!@is_object($this->$classname)) {
include_once($conf['classpath'] . '/'.$classname.'.inc.php'); if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
$this->$classname = new $classname; include_once($conf['classpath'].'/'.$classname.'.inc.php');
} $this->$classname = new $classname;
} }
} }
} }
}
} }
function load($classes) { function load($classes) {
global $conf; global $conf;
$cl = explode(',',$classes);
if(is_array($cl)) { $cl = explode(',',$classes);
foreach($cl as $classname) { if(is_array($cl)) {
if(is_file($conf['classpath'] . '/'.$classname.'.inc.php') && !is_link($conf['classpath'] . '/'.$classname.'.inc.php')) { foreach($cl as $classname) {
include_once($conf['classpath'] . '/'.$classname.'.inc.php'); if(is_file($conf['classpath'].'/'.$classname.'.inc.php') && !is_link($conf['classpath'].'/'.$classname.'.inc.php')) {
} else { include_once($conf['classpath'].'/'.$classname.'.inc.php');
die('Unable to load: '.$conf['classpath'] . '/'.$classname.'.inc.php'); } else {
} die('Unable to load: '.$conf['classpath'].'/'.$classname.'.inc.php');
} }
} }
}
} }
/* /*
...@@ -106,52 +108,50 @@ class app { ...@@ -106,52 +108,50 @@ class app {
function log($msg, $priority = 0) { function log($msg, $priority = 0) {
global $conf; global $conf;
if($priority >= $conf['log_priority']) { if($priority >= $conf['log_priority']) {
//if (is_writable($conf["log_file"])) { //if (is_writable($conf["log_file"])) {
if (!$fp = fopen ($conf['log_file'], 'a')) { if (!$fp = fopen ($conf['log_file'], 'a')) {
die('Unable to open logfile.'); die('Unable to open logfile.');
} }
switch ($priority) { switch ($priority) {
case 0: case 0:
$priority_txt = 'DEBUG'; $priority_txt = 'DEBUG';
break; break;
case 1: case 1:
$priority_txt = 'WARNING'; $priority_txt = 'WARNING';
break; break;
case 2: case 2:
$priority_txt = 'ERROR'; $priority_txt = 'ERROR';
break; break;
} }
if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) { if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
die('Unable to write to logfile.'); die('Unable to write to logfile.');
} }
echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n"; echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
fclose($fp); fclose($fp);
// Log to database // Log to database
if(isset($this->dbmaster)) { if(isset($this->dbmaster)) {
$server_id = $conf['server_id']; $server_id = $conf['server_id'];
$loglevel = $priority; $loglevel = $priority;
$tstamp = time(); $tstamp = time();
$message = $this->dbmaster->quote($msg); $message = $this->dbmaster->quote($msg);
$datalog_id = (isset($this->modules->current_datalog_id) && $this->modules->current_datalog_id > 0)?$this->modules->current_datalog_id:0; $datalog_id = (isset($this->modules->current_datalog_id) && $this->modules->current_datalog_id > 0)?$this->modules->current_datalog_id:0;
if($datalog_id > 0) { if($datalog_id > 0) {
$tmp_rec = $this->dbmaster->queryOneRecord("SELECT count(syslog_id) as number FROM sys_log WHERE datalog_id = $datalog_id AND loglevel = ".LOGLEVEL_ERROR); $tmp_rec = $this->dbmaster->queryOneRecord("SELECT count(syslog_id) as number FROM sys_log WHERE datalog_id = $datalog_id AND loglevel = ".LOGLEVEL_ERROR);
//* Do not insert duplicate errors into the web log. //* Do not insert duplicate errors into the web log.
if($tmp_rec['number'] == 0) { if($tmp_rec['number'] == 0) {
$sql = "INSERT INTO sys_log (server_id,datalog_id,loglevel,tstamp,message) VALUES ('$server_id',$datalog_id,'$loglevel','$tstamp','$message')"; $sql = "INSERT INTO sys_log (server_id,datalog_id,loglevel,tstamp,message) VALUES ('$server_id',$datalog_id,'$loglevel','$tstamp','$message')";
$this->dbmaster->query($sql); $this->dbmaster->query($sql);
}
} else {
$sql = "INSERT INTO sys_log (server_id,datalog_id,loglevel,tstamp,message) VALUES ('$server_id',0,'$loglevel','$tstamp','$message')";
$this->dbmaster->query($sql);
}
} }
} else {
$sql = "INSERT INTO sys_log (server_id,datalog_id,loglevel,tstamp,message) VALUES ('$server_id',0,'$loglevel','$tstamp','$message')";
$this->dbmaster->query($sql);
}
}
//} else { //} else {
// die("Unable to write to logfile."); // die("Unable to write to logfile.");
...@@ -167,7 +167,7 @@ class app { ...@@ -167,7 +167,7 @@ class app {
function error($msg) { function error($msg) {
$this->log($msg,3); $this->log($msg,3);
die($msg); die($msg);
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment