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

2
lib/functions/formfields/bool/function.getFormFieldOutputBool.php
View File

@@ -17,7 +17,7 @@
*
*/
function getFormFieldOutputBool($fieldname, $fielddata)
function getFormFieldOutputBool($fieldname, $fielddata, $do_show = true)
{
$label = $fielddata['label'];
$boolswitch = makeYesNo($fieldname, '1', '0', $fielddata['value']);

4
lib/functions/formfields/date/function.getFormFieldOutputDate.php
View File

@@ -17,12 +17,12 @@
*
*/
function getFormFieldOutputDate($fieldname, $fielddata)
function getFormFieldOutputDate($fieldname, $fielddata, $do_show = true)
{
if(isset($fielddata['date_timestamp']) && $fielddata['date_timestamp'] === true)
{
$fielddata['value'] = date('Y-m-d', $fielddata['value']);
}
return getFormFieldOutputString($fieldname, $fielddata);
return getFormFieldOutputString($fieldname, $fielddata, $do_show);
}

2
lib/functions/formfields/file/function.getFormFieldOutputFile.php
View File

@@ -15,7 +15,7 @@
*
*/
function getFormFieldOutputFile($fieldname, $fielddata)
function getFormFieldOutputFile($fieldname, $fielddata, $do_show = true)
{
$label = $fielddata['label'];
$value = htmlentities($fielddata['value']);

4
lib/functions/formfields/function.buildFormEx.php
View File

@@ -49,7 +49,7 @@ function buildFormEx($form, $part = '') {
$do_show = $groupdetails['visible'];
}
if ($do_show) {
//if ($do_show) {
if (isset($groupdetails['title']) && $groupdetails['title'] != '') {
$fields .= getFormGroupOutput($groupname, $groupdetails);
}
@@ -66,7 +66,7 @@ function buildFormEx($form, $part = '') {
$fields .= getFormFieldOutput($fieldname, $fielddetails);
}
}
}
//}
}
}
}

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;
}

8
lib/functions/formfields/function.getFormGroupOutput.php
View File

@@ -81,11 +81,13 @@ function getFormOverviewGroupOutput($groupname, $groupdetails) {
$websrv = Settings::Get('system.webserver');
if (!in_array($websrv, $groupdetails['websrv_avail'])) {
$do_show = false;
$title .= sprintf($lng['serversettings']['option_unavailable_websrv'], implode(", ", $groupdetails['websrv_avail']));
// hack disabled flag into select-box
$option = str_replace('<select class', '<select disabled="disabled" class', $option);
}
}
if ($do_show) {
eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
}
eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");
return $group;
}

2
lib/functions/formfields/hiddenstring/function.getFormFieldOutputString.php
View File

@@ -17,7 +17,7 @@
*
*/
function getFormFieldOutputHiddenString($fieldname, $fielddata)
function getFormFieldOutputHiddenString($fieldname, $fielddata, $do_show = true)
{
$label = $fielddata['label'];
$value = htmlentities($fielddata['value']);

4
lib/functions/formfields/int/function.getFormFieldOutputInt.php
View File

@@ -17,7 +17,7 @@
*
*/
function getFormFieldOutputInt($fieldname, $fielddata)
function getFormFieldOutputInt($fieldname, $fielddata, $do_show = true)
{
return getFormFieldOutputString($fieldname, $fielddata);
return getFormFieldOutputString($fieldname, $fielddata, $do_show);
}

4
lib/functions/formfields/option/function.getFormFieldOutputOption.php
View File

@@ -17,10 +17,10 @@
*
*/
function getFormFieldOutputOption($fieldname, $fielddata)
function getFormFieldOutputOption($fieldname, $fielddata, $do_show = true)
{
$returnvalue = '';
if(isset($fielddata['option_options']) && is_array($fielddata['option_options']) && !empty($fielddata['option_options']))
{
if(isset($fielddata['option_mode']) && $fielddata['option_mode'] == 'multiple')

2
lib/functions/formfields/string/function.getFormFieldOutputString.php
View File

@@ -17,7 +17,7 @@
*
*/
function getFormFieldOutputString($fieldname, $fielddata)
function getFormFieldOutputString($fieldname, $fielddata, $do_show = true)
{
$label = $fielddata['label'];
$value = htmlentities($fielddata['value']);

2
lib/functions/formfields/text/function.getFormFieldOutputText.php
View File

@@ -17,7 +17,7 @@
*
*/
function getFormFieldOutputText($fieldname, $fielddata)
function getFormFieldOutputText($fieldname, $fielddata, $do_show = true)
{
$label = $fielddata['label'];
$value = htmlentities($fielddata['value']);