ISPConfig3 devel
parent: dce3bb51 | patch | commit | ignore whitespace
Till Brehm
2013-11-19 07bf1285436a1add5e586682b87b6fb1233da3c2 
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
2 files modified
5 ■■■■■ changed files
server/lib/classes/plugins.inc.php 2 ●●●●● patch | view | raw | blame | history
server/server.php 3 ●●●●● patch | view | raw | blame | history 
 server/lib/classes/plugins.inc.php


@@ -134,7 +134,7 @@


    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);


        if($this->debug)  $app->log("Registered function '$function_name' from plugin '$plugin_name' for action '$action_name'.", LOGLEVEL_DEBUG);


    }








 server/server.php


@@ -172,6 +172,9 @@


    $app->modules->loadModules('all');


    //** Load the plugins that are in the plugins-enabled folder


    $app->plugins->loadPlugins('all');


	


    $app->plugins->raiseAction('server_plugins_loaded', '');


	


    if ($tmp_num_records > 0) {


        $app->log("Found $tmp_num_records changes, starting update process.", LOGLEVEL_DEBUG);


        //** Go through the sys_datalog table and call the processing functions