From f17e5b0b58eb420c40ca37cde95fc91842a96f04 Mon Sep 17 00:00:00 2001
From: pedro_morgan <pedro_morgan@ispconfig3>
Date: Fri, 17 Aug 2007 05:23:48 -0400
Subject: [PATCH] Tidied up app.inc.php * now php5 class * Inctroducted $_loaded_modules class var to silence "undefined property" error * Cleaned code to PEAR standards
---
server/lib/classes/modules.inc.php | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index 12b871e..41bc2ae 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -39,23 +39,25 @@
function loadModules() {
global $app, $conf;
- $modules_dir = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."mods-enabled".$conf["fs_div"]
+
+ $modules_dir = $conf["rootpath"].$conf["fs_div"]."mods-enabled".$conf["fs_div"];
if (is_dir($modules_dir)) {
- if ($dh = opendir($dir)) {
+ if ($dh = opendir($modules_dir)) {
while (($file = readdir($dh)) !== false) {
- if($file != '.' && $file != '..') {
+ if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
$module_name = substr($file,0,-8);
include_once($modules_dir.$file);
$app->log("Loading Module: $module_name",LOGLEVEL_DEBUG);
- $app->modules[$module_name] = new $module_name;
- $app->modules[$module_name]->onLoad();
+ $app->loaded_modules[$module_name] = new $module_name;
+ $app->loaded_modules[$module_name]->onLoad();
}
}
}
} else {
$app->log("Modules directory missing: $modules_dir",LOGLEVEL_ERROR);
}
+
}
/*
@@ -64,7 +66,9 @@
*/
function registerTableHook($table_name,$module_name,$function_name) {
+ global $app;
$this->notification_hooks[$table_name][] = array('module' => $module_name, 'function' => $function_name);
+ $app->log("Registered TableHook '$table_name' in module '$module_name' for processing function '$function_name'",LOGLEVEL_DEBUG);
}
/*
@@ -74,14 +78,16 @@
*/
function processDatalog() {
- global $app;
+ global $app,$conf;
// TODO: process only new entries.
- $sql = "SELECT * FROM sys_datalog WHERE 1";
+ $sql = "SELECT * FROM sys_datalog WHERE server_id = ".$conf["server_id"]." ORDER BY datalog_id";
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
$data = unserialize(stripslashes($rec["data"]));
$this->raiseTableHook($rec["dbtable"],$rec["action"],$data);
+ $app->db->query("DELETE FROM sys_datalog WHERE datalog_id = ".$rec["datalog_id"]);
+ $app->log("Deleting sys_datalog ID ".$rec["datalog_id"],LOGLEVEL_DEBUG);
}
}
@@ -90,13 +96,15 @@
// Get the hooks for this table
$hooks = $this->notification_hooks[$table_name];
+ $app->log("Raised TableHook for table: '$table_name'",LOGLEVEL_DEBUG);
if(is_array($hooks)) {
foreach($hooks as $hook) {
$module_name = $hook["module"];
$function_name = $hook["function"];
// Claa the processing function of the module
- call_user_method($function_name,$app->modules[$module_name],$table_name,$action,$data);
+ $app->log("Call function '$function_name' in module '$module_name' raised by TableHook '$table_name'.",LOGLEVEL_DEBUG);
+ call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
unset($module_name);
unset($function_name);
}
--
Gitblit v1.9.1