From c82dc7f2db065520f80c3c726f39e14ec5bdcbe9 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 02 Sep 2009 13:16:06 -0400
Subject: [PATCH] Restart apache instead of reloading it when system is chrooted as a reload fails when mod_chroot is used.
---
server/lib/classes/plugins.inc.php | 70 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index 5e2147f..826944a 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -30,28 +30,44 @@
class plugins {
- var $notification_events = array();
+ var $available_events = array();
+ var $subscribed_events = array();
+ var $debug = false;
/*
- This function is called to load the plugins from the plugins-available folder
+ This function is called to load the plugins from the plugins-enabled or the plugins-core folder
*/
- function loadPlugins() {
+ function loadPlugins($type) {
global $app,$conf;
+
+ $subPath = 'plugins-enabled';
+ if ($type == 'core') $subPath = 'plugins-core';
- $plugins_dir = $conf["rootpath"].$conf["fs_div"]."lib".$conf["fs_div"]."plugins-enabled".$conf["fs_div"]
+ $plugins_dir = $conf["rootpath"].$conf["fs_div"].$subPath.$conf["fs_div"];
+ $tmp_plugins = array();
if (is_dir($plugins_dir)) {
- if ($dh = opendir($dir)) {
+ if ($dh = opendir($plugins_dir)) {
+ //** Go trough all files in the plugin dir
while (($file = readdir($dh)) !== false) {
- if($file != '.' && $file != '..') {
+ if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
$plugin_name = substr($file,0,-8);
- include_once($plugins_dir.$file);
- $app->log("Loading Plugin: $plugin_name",LOGLEVEL_DEBUG);
- $app->plugins[$plugin_name] = new $module_name;
- $app->plugins[$plugin_name]->onLoad();
+ $tmp_plugins[$plugin_name] = $file;
}
}
+ //** sort the plugins by name
+ ksort($tmp_plugins);
+
+ //** load the plugins
+ foreach($tmp_plugins as $plugin_name => $file) {
+ include_once($plugins_dir.$file);
+ if($this->debug) $app->log("Loading Plugin: $plugin_name",LOGLEVEL_DEBUG);
+ $app->loaded_plugins[$plugin_name] = new $plugin_name;
+ $app->loaded_plugins[$plugin_name]->onLoad();
+ }
+ } else {
+ $app->log("Unable to open the plugin directory: $plugins_dir",LOGLEVEL_ERROR);
}
} else {
$app->log("Plugin directory missing: $plugins_dir",LOGLEVEL_ERROR);
@@ -60,27 +76,47 @@
}
/*
- This function is called by the modules to register for a specific
- table change notification
+ This function is used by the modules to announce which events they provide
+ */
+
+ function announceEvents($module_name,$events) {
+ global $app;
+ foreach($events as $event_name) {
+ $this->available_events[$event_name] = $module_name;
+ if($this->debug) $app->log("Announced event: $event_name",LOGLEVEL_DEBUG);
+ }
+ }
+
+
+ /*
+ This function is called by the plugin to register for an event
*/
function registerEvent($event_name,$plugin_name,$function_name) {
- $this->notification_events[$event_name][] = array('plugin' => $plugin_name, 'function' => $function_name);
+ global $app;
+ if(!isset($this->available_events[$event_name])) {
+ $app->log("Unable to register the function '$function_name' in the plugin '$plugin_name' for event '$event_name'",LOGLEVEL_DEBUG);
+ } else {
+ $this->subscribed_events[$event_name][] = array('plugin' => $plugin_name, 'function' => $function_name);
+ if($this->debug) $app->log("Registered the function '$function_name' in the plugin '$plugin_name' for event '$event_name'.",LOGLEVEL_DEBUG);
+ }
}
function raiseEvent($event_name,$data) {
global $app;
- // Get the hooks for this table
- $events = $this->notification_hevents[$event_name];
+ // Get the subscriptions for this event
+ $events = (isset($this->subscribed_events[$event_name]))?$this->subscribed_events[$event_name]:'';
+ if($this->debug) $app->log("Raised event: '$event_name'",LOGLEVEL_DEBUG);
if(is_array($events)) {
foreach($events as $event) {
$plugin_name = $event["plugin"];
$function_name = $event["function"];
- // Claa the processing function of the module
- call_user_method($function_name,$app->plugins[$plugin_name],$event_name,$data);
+ // Call the processing function of the plugin
+ $app->log("Call function '$function_name' in plugin '$plugin_name' raised by event '$event_name'.",LOGLEVEL_DEBUG);
+ call_user_method($function_name,$app->loaded_plugins[$plugin_name],$event_name,$data);
unset($plugin_name);
unset($function_name);
}
--
Gitblit v1.9.1