maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

sort distribution-names in admin_configfiles, it's confusing otherwise; display the default/recommended daemon of every service; fix small c'n'p error (courier is not our recommended default)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-02-09 14:49:53 +01:00
parent b8e548d1df
commit 855226d01a
5 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
admin_configfiles.php
View File

@@ -71,7 +71,11 @@ if ($userinfo['change_serversettings'] == '1') {
if ($daemon == "") {
foreach ($daemons as $di => $dd) {
$daemons_select .= makeoption($dd->title, $di);
$title = $dd->title;
if ($dd->default) {
$title = $title." ".$lng['panel']['default'];
}
$daemons_select .= makeoption($title, $di);
}
}
} else {
@@ -83,14 +87,24 @@ if ($userinfo['change_serversettings'] == '1') {
// show list of available distro's
$distros = glob($config_dir . '*.xml');
// tmp array
$distributions_select_data = array();
// read in all the distros
foreach ($distros as $_distribution) {
// get configparser object
$dist = new ConfigParser($_distribution);
// get distro-info
$dist_display = getCompleteDistroName($dist);
// store in tmp array
$distributions_select_data[$dist_display] = str_replace(".xml", "", strtolower(basename($_distribution)));
}
// sort by distribution name
ksort($distributions_select_data);
foreach ($distributions_select_data as $dist_display => $dist_index) {
// create select-box-option
$distributions_select .= makeoption($dist_display, str_replace(".xml", "", strtolower(basename($_distribution))));
$distributions_select .= makeoption($dist_display, $dist_index);
}
}

9
lib/classes/config/class.ConfigDaemon.php
View File

@@ -67,6 +67,12 @@ class ConfigDaemon {
*/
public $title;
/**
* Whether this is the default daemon of the service-category
* @var boolean
*/
public $default;
public function __construct($xml, $xpath) {
$this->fullxml = $xml;
$this->xpath = $xpath;
@@ -75,6 +81,9 @@ class ConfigDaemon {
if ($attributes['title'] != '') {
$this->title = $this->_parseContent((string)$attributes['title']);
}
if (isset($attributes['default'])) {
$this->default = ($attributes['default'] == true);
}
}
/**

2
lib/configfiles/precise.xml
View File

@@ -954,7 +954,7 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
<command><![CDATA[/etc/init.d/dovecot restart]]></command>
</daemon>
<!-- Courier -->
<daemon name="courier" title="Courier" default="true">
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">

2
lib/configfiles/trusty.xml
View File

@@ -932,7 +932,7 @@ iterate_query = SELECT username AS user FROM mail_users WHERE (imap = 1 OR pop3
<command><![CDATA[service dovecot restart]]></command>
</daemon>
<!-- Courier -->
<daemon name="courier" title="Courier" default="true">
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">

2
lib/configfiles/wheezy.xml
View File

@@ -3745,7 +3745,7 @@ plugin {
<command><![CDATA[/etc/init.d/dovecot restart]]></command>
</daemon>
<!-- Courier -->
<daemon name="courier" title="Courier" default="true">
<daemon name="courier" title="Courier">
<install><![CDATA[apt-get install courier-pop courier-imap courier-authlib-mysql]]></install>
<file name="/etc/courier/authdaemonrc" chown="root:0" chmod="0600"
backup="true">