From 061e9a70ecd62c79b991cd967b11cb3e8ddd78e8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 11 Jan 2011 09:28:12 -0500
Subject: [PATCH] Replaced calls for call_user_method with call_user_func to avoid php deprecated warnings.
---
interface/lib/classes/plugin.inc.php | 3 ++-
server/lib/classes/modules.inc.php | 5 +++--
server/lib/classes/services.inc.php | 3 ++-
server/lib/classes/plugins.inc.php | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/interface/lib/classes/plugin.inc.php b/interface/lib/classes/plugin.inc.php
index 086ef70..450efd0 100644
--- a/interface/lib/classes/plugin.inc.php
+++ b/interface/lib/classes/plugin.inc.php
@@ -148,7 +148,8 @@
$app->loaded_plugins[$plugin_name] = new $plugin_name;
}
if($this->debug) $app->log("Called method: '$function_name' in plugin '$plugin_name' for event '$event_name'",LOGLEVEL_DEBUG);
- call_user_method($function_name,$app->loaded_plugins[$plugin_name],$event_name,$data);
+ // call_user_method($function_name,$app->loaded_plugins[$plugin_name],$event_name,$data);
+ call_user_func(array($app->loaded_plugins[$plugin_name],$function_name),$event_name,$data);
}
}
diff --git a/server/lib/classes/modules.inc.php b/server/lib/classes/modules.inc.php
index fff4928..8c86097 100644
--- a/server/lib/classes/modules.inc.php
+++ b/server/lib/classes/modules.inc.php
@@ -243,9 +243,10 @@
foreach($hooks as $hook) {
$module_name = $hook['module'];
$function_name = $hook['function'];
- // Claa the processing function of the module
+ // Call the processing function of the module
if($this->debug) $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);
+ // call_user_method($function_name,$app->loaded_modules[$module_name],$table_name,$action,$data);
+ call_user_func(array($app->loaded_modules[$module_name],$function_name),$table_name,$action,$data);
unset($module_name);
unset($function_name);
}
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index d5d8f20..ba12981 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -116,7 +116,8 @@
$function_name = $event['function'];
// Call the processing function of the plugin
$app->log("Calling function '$function_name' from plugin '$plugin_name' raised by event '$event_name'.",LOGLEVEL_DEBUG);
- call_user_method($function_name,$app->loaded_plugins[$plugin_name],$event_name,$data);
+ // call_user_method($function_name,$app->loaded_plugins[$plugin_name],$event_name,$data);
+ call_user_func(array($app->loaded_plugins[$plugin_name],$function_name),$event_name,$data);
unset($plugin_name);
unset($function_name);
}
diff --git a/server/lib/classes/services.inc.php b/server/lib/classes/services.inc.php
index e53eee0..d10abf2 100644
--- a/server/lib/classes/services.inc.php
+++ b/server/lib/classes/services.inc.php
@@ -54,7 +54,8 @@
$module_name = $this->registered_services[$service_name]['module'];
$function_name = $this->registered_services[$service_name]['function'];
$app->log("Calling function '$function_name' from module '$module_name'.",LOGLEVEL_DEBUG);
- call_user_method($function_name,$app->loaded_modules[$module_name],$action);
+ // call_user_method($function_name,$app->loaded_modules[$module_name],$action);
+ call_user_func(array($app->loaded_modules[$module_name],$function_name),$action);
} else {
$app->log("Unable to restart $service_name. Service not registered.",LOGLEVEL_WARNING);
}
--
Gitblit v1.9.1