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

allow empty select-value for panel.customer_hide_options

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-10-13 10:48:28 +02:00
parent ce31a0b3fd
commit f406962dfd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
actions/admin/settings/100.panel.php
View File

@@ -234,6 +234,7 @@ return array(
'type' => 'option', 'type' => 'option',
'default' => '', 'default' => '',
'option_mode' => 'multiple', 'option_mode' => 'multiple',
'option_emptyallowed' => true,
'option_options' => array( 'option_options' => array(
'email' => $lng['menue']['email']['email'], 'email' => $lng['menue']['email']['email'],
'mysql' => $lng['menue']['mysql']['mysql'], 'mysql' => $lng['menue']['mysql']['mysql'],

7
lib/functions/formfields/option/function.validateFormFieldOption.php
View File

@@ -20,7 +20,7 @@
function validateFormFieldOption($fieldname, $fielddata, $newfieldvalue) function validateFormFieldOption($fieldname, $fielddata, $newfieldvalue)
{ {
$returnvalue = true; $returnvalue = true;
if(isset($fielddata['option_mode']) && $fielddata['option_mode'] == 'multiple') if(isset($fielddata['option_mode']) && $fielddata['option_mode'] == 'multiple')
{ {
$options = explode(',', $newfieldvalue); $options = explode(',', $newfieldvalue);
@@ -33,13 +33,16 @@ function validateFormFieldOption($fieldname, $fielddata, $newfieldvalue)
{ {
$returnvalue = isset($fielddata['option_options'][$newfieldvalue]); $returnvalue = isset($fielddata['option_options'][$newfieldvalue]);
} }
if($returnvalue === true) if($returnvalue === true)
{ {
return true; return true;
} }
else else
{ {
if (isset($fielddata['option_emptyallowed']) && $fielddata['option_emptyallowed']) {
return true;
}
return 'not in option'; return 'not in option';
} }
} }