extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix server-side validation to allow values of option children

Browse Source
This commit is contained in:
Ralf Becker 2016-04-21 14:51:40 +00:00
parent d8cf78d045
commit 9a57fbaedd
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/Etemplate/Widget/Select.php
View File

@ -137,10 +137,16 @@ class Select extends Etemplate\Widget
$allowed2 = self::selOptions($form_name, true); // true = return array of option-values $allowed2 = self::selOptions($form_name, true); // true = return array of option-values
$type_options = self::typeOptions($this, $type_options = self::typeOptions($this,
// typeOptions thinks # of rows is the first thing in options // typeOptions thinks # of rows is the first thing in options
($this->attrs['rows'] && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'].','.$this->attrs['options'] : $this->attrs['options'])); ($this->attrs['rows'] && strpos($this->attrs['options'], $this->attrs['rows']) !== 0 ? $this->attrs['rows'].','.$this->attrs['options'] : $this->attrs['options']));
$allowed = array_merge($allowed2,array_keys($type_options)); $allowed = array_merge($allowed2,array_keys($type_options));
// add option children's values too, "" is not read, therefore we cast to string
foreach($this->children as $child)
{
if ($child->type == 'option') $allowed[] = (string)$child->attrs['value'];
}
if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1)) $allowed[] = ''; if (!$this->attrs['multiple'] || !($this->attrs['options'] > 1)) $allowed[] = '';
foreach((array) $value as $val) foreach((array) $value as $val)