From e28564dbde4f922a6a8263e3dea32d56b60b5b5b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 16 Jun 2010 11:41:46 -0400
Subject: [PATCH] Implemented: FS#468 - Client name conversion in FTP user too restricted
---
server/lib/classes/plugins.inc.php | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index 63c8cb9..826944a 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -32,15 +32,19 @@
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"]."plugins-enabled".$conf["fs_div"];
+ $plugins_dir = $conf["rootpath"].$conf["fs_div"].$subPath.$conf["fs_div"];
$tmp_plugins = array();
if (is_dir($plugins_dir)) {
@@ -58,7 +62,7 @@
//** load the plugins
foreach($tmp_plugins as $plugin_name => $file) {
include_once($plugins_dir.$file);
- $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();
}
@@ -79,7 +83,7 @@
global $app;
foreach($events as $event_name) {
$this->available_events[$event_name] = $module_name;
- $app->log("Announced event: $event_name",LOGLEVEL_DEBUG);
+ if($this->debug) $app->log("Announced event: $event_name",LOGLEVEL_DEBUG);
}
}
@@ -94,7 +98,7 @@
$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);
- $app->log("Registered the function '$function_name' in the plugin '$plugin_name' for event '$event_name'.",LOGLEVEL_DEBUG);
+ if($this->debug) $app->log("Registered the function '$function_name' in the plugin '$plugin_name' for event '$event_name'.",LOGLEVEL_DEBUG);
}
}
@@ -103,8 +107,8 @@
global $app;
// Get the subscriptions for this event
- $events = $this->subscribed_events[$event_name];
- $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) {
--
Gitblit v1.9.1