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

visible-tag needs to respect the do_show-value in case websrv_avail set do_show to false already

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-03-02 13:40:38 +01:00
parent fe718ef67f
commit 27514d32de
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,8 +43,9 @@ function buildFormEx($form, $part = '') {
} }
// visible = Settings::Get('phpfpm.enabled') for example would result in false if not enabled // visible = Settings::Get('phpfpm.enabled') for example would result in false if not enabled
// and therefore not shown as intended // and therefore not shown as intended. Only check if do_show is still true as it might
if (isset($groupdetails['visible'])) { // be false due to websrv_avail
if (isset($groupdetails['visible']) && $do_show) {
$do_show = $groupdetails['visible']; $do_show = $groupdetails['visible'];
} }

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

@@ -55,8 +55,9 @@ function getFormFieldOutput($fieldname, $fielddata) {
} }
// visible = Settings::Get('phpfpm.enabled') for example would result in false if not enabled // visible = Settings::Get('phpfpm.enabled') for example would result in false if not enabled
// and therefore not shown as intended // and therefore not shown as intended. Only check if do_show is still true as it might
if (isset($fielddata['visible'])) { // be false due to websrv_avail
if (isset($fielddata['visible']) && $do_show) {
$do_show = $fielddata['visible']; $do_show = $fielddata['visible'];
} }

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

@@ -49,7 +49,7 @@ function getFormOverviewGroupOutput($groupname, $groupdetails) {
if($fielddetails['type'] == 'option') if($fielddetails['type'] == 'option')
{ {
$options_array = $fielddetails['option_options']; $options_array = $fielddetails['option_options'];
$options = ''; $options = '';
foreach($options_array as $value => $vtitle) foreach($options_array as $value => $vtitle)
{ {
@@ -82,7 +82,7 @@ function getFormOverviewGroupOutput($groupname, $groupdetails) {
if (!in_array($websrv, $groupdetails['websrv_avail'])) { if (!in_array($websrv, $groupdetails['websrv_avail'])) {
$do_show = false; $do_show = false;
} }
} }
if ($do_show) { if ($do_show) {
eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";"); eval("\$group = \"" . getTemplate("settings/settings_overviewgroup") . "\";");