From 0a1f027bd9b71d618376e1365c35d95d97b15782 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 07 Dec 2008 10:32:29 -0500
Subject: [PATCH] - Detect installed services - Update server.ini during install - Changed default vmail directory form /home/vmail to /var/vmail
---
server/lib/classes/plugins.inc.php | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index 7ffc803..8d016d2 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -34,25 +34,39 @@
var $subscribed_events = array();
/*
- 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)) {
if ($dh = opendir($plugins_dir)) {
+ //** Go trough all files in the plugin dir
while (($file = readdir($dh)) !== false) {
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->loaded_plugins[$plugin_name] = new $plugin_name;
- $app->loaded_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);
+ $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);
--
Gitblit v1.9.1