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

Merge pull request #391 from nachtgeist/master

Browse Source 
no longer show NameVirtualHost option for apache 2.4
This commit is contained in:
Michael Kaufmann
2016-09-24 23:37:07 +02:00
committed by GitHub
parent 9799e05ce4 02797d9abc
commit 79b839c024
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');
$is_nginx = ($websrv == 'nginx');
$is_apache = ($websrv == 'apache2');
$is_apache24 = $is_apache && (Settings::Get('system.apache24') === '1');
if ($action == '') {

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

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

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

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