let the admin set the server-alias completely (either wildcard, www. or none), customer option follows, this fixes #1147

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-10-14 09:50:55 +02:00
parent e1fa5f6f0a
commit 1a99a272b1
5 changed files with 72 additions and 27 deletions

View File

@@ -119,13 +119,11 @@ return array(
'type' => 'label',
'value' => $lng['panel']['nosslipsavailable']
),
'wwwserveralias' => array(
'label' => $lng['admin']['wwwserveralias'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array('1')
'selectserveralias' => array(
'label' => $lng['admin']['selectserveralias'],
'desc' => $lng['admin']['selectserveralias_desc'],
'type' => 'select',
'select_var' => $serveraliasoptions
),
'speciallogfile' => array(
'label' => $lng['admin']['speciallogfile']['title'],

View File

@@ -130,13 +130,11 @@ return array(
'type' => 'label',
'value' => $lng['panel']['nosslipsavailable']
),
'wwwserveralias' => array(
'label' => $lng['admin']['wwwserveralias'],
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array($result['wwwserveralias'])
'selectserveralias' => array(
'label' => $lng['admin']['selectserveralias'],
'desc' => $lng['admin']['selectserveralias_desc'],
'type' => 'select',
'select_var' => $serveraliasoptions
),
'speciallogfile' => array(
'label' => $lng['admin']['speciallogfile']['title'],