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

select correct value for serveralias-option when editing domain; customer now has same options as admin; refs #1147

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-10-14 10:08:15 +02:00
parent 1a99a272b1
commit 207f5c69d4
3 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
admin_domains.php
View File

@@ -1482,15 +1482,15 @@ if($page == 'domains'
// create serveralias options
$serveraliasoptions = "";
$values = array('0' => '0', '1' => '0', '2' => '1');
$_value = '2';
if ($result['iswildcarddomain'] == '1') {
$values = array('0' => '1', '1' => '0', '2' => '0');
$_value = '0';
} elseif ($result['wwwserveralias'] == '1') {
$values = array('0' => '0', '1' => '1', '2' => '0');
$_value = '1';
}
$serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_wildcard'], '0', $values['0'], true, true);
$serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_www'], '1', $values['1'], true, true);
$serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_none'], '2', $values['2'], true, true);
$serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_wildcard'], '0', $_value, true, true);
$serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_www'], '1', $_value, true, true);
$serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_none'], '2', $_value, true, true);
$subcanemaildomain = makeoption($lng['admin']['subcanemaildomain']['never'], '0', $result['subcanemaildomain'], true, true);
$subcanemaildomain.= makeoption($lng['admin']['subcanemaildomain']['choosableno'], '1', $result['subcanemaildomain'], true, true);