From 5fa6803ab4d29adbb103e749619510985e826db8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 10 Jun 2008 19:06:54 +0000
Subject: [PATCH] - Changed the plugin loader to load plugins in alphabetical
order - Changed the default settings for websites
---
interface/web/sites/form/web_domain.tform.php | 8 ++++----
server/lib/app.inc.php | 2 +-
server/lib/classes/plugins.inc.php | 19 +++++++++++++++----
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php
index 6938bea6f9..44f219330a 100644
--- a/interface/web/sites/form/web_domain.tform.php
+++ b/interface/web/sites/form/web_domain.tform.php
@@ -144,25 +144,25 @@ $form["tabs"]['domain'] = array (
'cgi' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'y',
+ 'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
'ssi' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'y',
+ 'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
'suexec' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'y',
+ 'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
'ssl' => array (
'datatype' => 'VARCHAR',
'formtype' => 'CHECKBOX',
- 'default' => 'y',
+ 'default' => 'n',
'value' => array(0 => 'n',1 => 'y')
),
'php' => array (
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index e8e9b93890..62580db060 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -104,7 +104,7 @@ class app {
if (!fwrite($fp, date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."\r\n")) {
die("Unable to write to logfile.");
}
- echo date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."<br>\n";
+ echo date("d.m.Y-H:i")." - ".$priority_txt." - ". $msg."\n";
fclose($fp);
//} else {
diff --git a/server/lib/classes/plugins.inc.php b/server/lib/classes/plugins.inc.php
index 7ffc803a2a..63c8cb979b 100644
--- a/server/lib/classes/plugins.inc.php
+++ b/server/lib/classes/plugins.inc.php
@@ -41,18 +41,29 @@ class plugins {
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);
--
GitLab