diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 6938bea6f9c2bcaec33ec4897d902ab2091fe1a4..44f219330a6aead9997312bb972437088940c4c8 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 e8e9b938903b654ef0698db02eafb60f18735126..62580db060314ab879d15305486492e39525ed84 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 7ffc803a2a57b160d821cd2338bbdcebe37f9f1b..63c8cb979b116fd52e33a3a8d7c3a149f3e17f49 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);