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

no longer show NameVirtualHost option for apache 2.4

Browse Source
This commit is contained in:
Daniel Reichelt
2016-09-24 21:58:20 +02:00
parent 9799e05ce4
commit 02797d9abc
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
admin_ipsandports.php
View File

@@ -33,6 +33,7 @@ if ($page == 'ipsandports'
$websrv = Settings::Get('system.webserver'); $websrv = Settings::Get('system.webserver');
$is_nginx = ($websrv == 'nginx'); $is_nginx = ($websrv == 'nginx');
$is_apache = ($websrv == 'apache2'); $is_apache = ($websrv == 'apache2');
$is_apache24 = $is_apache && (Settings::Get('system.apache24') === '1');
if ($action == '') { if ($action == '') {

2
lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
View File

@@ -49,7 +49,7 @@ return array(
'value' => array('1') 'value' => array('1')
), ),
'namevirtualhost_statement' => array( 'namevirtualhost_statement' => array(
'visible' => $is_apache, 'visible' => $is_apache && !$is_apache24,
'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(

2
lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
View File

@@ -51,7 +51,7 @@ return array(
'value' => array($result['listen_statement']) 'value' => array($result['listen_statement'])
), ),
'namevirtualhost_statement' => array( 'namevirtualhost_statement' => array(
'visible' => $is_apache, 'visible' => $is_apache && !$is_apache24,
'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'], 'label' => $lng['admin']['ipsandports']['create_namevirtualhost_statement'],
'type' => 'checkbox', 'type' => 'checkbox',
'values' => array( 'values' => array(