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

do not hide unavailable options, just disable them so people can see what is actually possible but just not available due to webserver-usage or other settings

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-09-12 11:23:29 +02:00
parent b8c2047379
commit 3b157a8c66
19 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/functions/formfields/function.getFormFieldOutput.php
View File

@@ -19,6 +19,8 @@
function getFormFieldOutput($fieldname, $fielddata) {
global $lng;
$returnvalue = '';
if (is_array($fielddata)
&& isset($fielddata['type'])
@@ -51,6 +53,7 @@ function getFormFieldOutput($fieldname, $fielddata) {
$websrv = Settings::Get('system.webserver');
if (!in_array($websrv, $fielddata['websrv_avail'])) {
$do_show = false;
$fielddata['label'].= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $fielddata['websrv_avail']));
}
}
@@ -59,11 +62,14 @@ function getFormFieldOutput($fieldname, $fielddata) {
// be false due to websrv_avail
if (isset($fielddata['visible']) && $do_show) {
$do_show = $fielddata['visible'];
if (!$do_show) {
$fielddata['label'].= $lng['serversettings']['option_unavailable'];
}
}
if ($do_show) {
$returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata);
}
//if ($do_show) {
$returnvalue = call_user_func('getFormFieldOutput' . ucfirst($fielddata['type']), $fieldname, $fielddata, $do_show);
//}
}
return $returnvalue;
}