From f91a2995d99b8cae9e6880ad11d2cee49de92679 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 12 Dec 2012 07:07:45 -0500
Subject: [PATCH] - NS field in dns slave has to be a IP address - Added missing validator for xfer field in dns zone fom
---
server/lib/classes/plugins.inc.php | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index beb7868..afef438 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -1,7 +1,7 @@
<?php
/*
-Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+Copyright (c) 2007-2012, Till Brehm, projektfarm Gmbh
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -32,6 +32,7 @@
var $available_events = array();
var $subscribed_events = array();
+ var $subscribed_actions = array();
var $debug = false;
/*
@@ -44,7 +45,7 @@
$subPath = 'plugins-enabled';
if ($type == 'core') $subPath = 'plugins-core';
- $plugins_dir = $conf["rootpath"].$conf["fs_div"].$subPath.$conf["fs_div"];
+ $plugins_dir = $conf['rootpath'].$conf['fs_div'].$subPath.$conf['fs_div'];
$tmp_plugins = array();
if (is_dir($plugins_dir)) {
@@ -62,15 +63,15 @@
//** 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);
+ 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);
+ $app->log('Unable to open the plugins directory: '.$plugins_dir,LOGLEVEL_ERROR);
}
} else {
- $app->log("Plugin directory missing: $plugins_dir",LOGLEVEL_ERROR);
+ $app->log('Plugins directory missing: '.$plugins_dir,LOGLEVEL_ERROR);
}
}
@@ -83,7 +84,7 @@
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);
+ if($this->debug) $app->log('Announced event: '.$event_name,LOGLEVEL_DEBUG);
}
}
@@ -95,10 +96,10 @@
function registerEvent($event_name,$plugin_name,$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);
+ $app->log("Unable to register function '$function_name' from 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);
+ if($this->debug) $app->log("Registered function '$function_name' from plugin '$plugin_name' for event '$event_name'.",LOGLEVEL_DEBUG);
}
}
@@ -107,16 +108,17 @@
global $app;
// Get the subscriptions for this event
- $events = $this->subscribed_events[$event_name];
- if($this->debug) $app->log("Raised event: '$event_name'",LOGLEVEL_DEBUG);
+ $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"];
+ $plugin_name = $event['plugin'];
+ $function_name = $event['function'];
// 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);
+ $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_func(array($app->loaded_plugins[$plugin_name],$function_name),$event_name,$data);
unset($plugin_name);
unset($function_name);
}
@@ -125,6 +127,45 @@
unset($events);
}
+ /*
+ This function is called by the plugin to register for an action
+ */
+
+ function registerAction($action_name,$plugin_name,$function_name) {
+ global $app;
+ $this->subscribed_actions[$action_name][] = array('plugin' => $plugin_name, 'function' => $function_name);
+ if($this->debug) $app->log("Registered function '$function_name' from plugin '$plugin_name' for action '$event_name'.",LOGLEVEL_DEBUG);
+ }
+
+
+ function raiseAction($action_name,$data) {
+ global $app;
+
+ //* Get the subscriptions for this action
+ $actions = (isset($this->subscribed_actions[$action_name]))?$this->subscribed_actions[$action_name]:'';
+ if($this->debug) $app->log('Raised action: '.$action_name,LOGLEVEL_DEBUG);
+
+ if(is_array($actions)) {
+ foreach($actions as $action) {
+ $plugin_name = $action['plugin'];
+ $function_name = $action['function'];
+ $state_out = 'ok';
+ //* Call the processing function of the plugin
+ $app->log("Calling function '$function_name' from plugin '$plugin_name' raised by action '$action_name'.",LOGLEVEL_DEBUG);
+ $state = call_user_func(array($app->loaded_plugins[$plugin_name],$function_name),$action_name,$data);
+ //* ensure that we return the highest warning / error level if a error occured in one of the functions
+ if($state == 'warning' && $state_out != 'error') $state_out = 'warning';
+ if($state == 'error') $state_out = 'error';
+ unset($plugin_name);
+ unset($function_name);
+ }
+ }
+ unset($action);
+ unset($actions);
+
+ return $state_out;
+ }
+
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1