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

fix hide-incompatible-settings feature

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-12-30 17:16:15 +01:00
parent f213d666e2
commit 5efc1849b4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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