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

update link to perl-fastcgi wiki on nginx.com; added setting to hide incompatible settings (depending on webserver)

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-12-30 16:41:26 +01:00
parent ab1c76e104
commit 78495b6487
12 changed files with 71 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Froxlor.php
View File

@@ -10,7 +10,7 @@ final class Froxlor
const VERSION = '0.10.23.1';
// Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '202009070';
const DBVERSION = '202012300';
// Distribution branding-tag (used for Debian etc.)
const BRANDING = '';

15
lib/Froxlor/UI/Form.php
View File

@@ -428,7 +428,7 @@ class Form
if (isset($fielddata['websrv_avail']) && is_array($fielddata['websrv_avail'])) {
$websrv = Settings::Get('system.webserver');
if (! in_array($websrv, $fielddata['websrv_avail'])) {
$do_show = false;
$do_show = Settings::Get('system.hide_incompatible_settings') == '1' ? false : true;
$fielddata['label'] .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail']));
}
}
@@ -439,16 +439,17 @@ class Form
if (isset($fielddata['visible']) && $do_show) {
$do_show = $fielddata['visible'];
if (! $do_show) {
$do_show = Settings::Get('system.hide_incompatible_settings') == '1' ? false : true;
$fielddata['label'] .= $lng['serversettings']['option_unavailable'];
}
}
// if ($do_show) {
$returnvalue = call_user_func(array(
'\\Froxlor\\UI\\Fields',
'getFormFieldOutput' . ucfirst($fielddata['type'])
), $fieldname, $fielddata, $do_show);
// }
if ($do_show) {
$returnvalue = call_user_func(array(
'\\Froxlor\\UI\\Fields',
'getFormFieldOutput' . ucfirst($fielddata['type'])
), $fieldname, $fielddata, $do_show);
}
}
return $returnvalue;
}