From b889edb33e4a09cc1f65d2fb9ad9f9ea16b1eae9 Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Tue, 04 Sep 2012 11:42:42 -0400 Subject: [PATCH] - Ported changes from Apache plugin to nginx plugin. - Fixed errors in system.inc.php- --- server/lib/classes/plugins.inc.php | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php index d5d8f20..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; /* @@ -116,7 +117,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); } @@ -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; + } + } ?> -- Gitblit v1.9.1