From 5fa6803ab4d29adbb103e749619510985e826db8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 10 Jun 2008 15:06:54 -0400
Subject: [PATCH] - Changed the plugin loader to load plugins in alphabetical order - Changed the default settings for websites

---
 server/lib/classes/plugins.inc.php |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index 7ffc803..63c8cb9 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -41,18 +41,29 @@
 		global $app,$conf;
 		
 		$plugins_dir = $conf["rootpath"].$conf["fs_div"]."plugins-enabled".$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