holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change validation to accept & validate numeric list IDs if include_lists is set.

Browse Source
This commit is contained in:
Nathan Gray 2014-06-04 20:00:46 +00:00
parent f82559b525
commit 470cf39e94
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/inc/class.etemplate_widget_taglist.inc.php
View File

@ -112,7 +112,15 @@ class etemplate_widget_taglist extends etemplate_widget
self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($allowed))),''); self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($allowed))),'');
unset($value[$key]); unset($value[$key]);
} }
if($this->type == 'taglist-email' && !preg_match(etemplate_widget_url::EMAIL_PREG, $val)) if($this->type == 'taglist-email' && $this->attrs['include_lists'] && is_numeric($val))
{
$lists = $GLOBALS['egw']->contacts->get_lists(EGW_ACL_READ);
if(!array_key_exists($val, $lists))
{
self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($lists))),'');
}
}
else if($this->type == 'taglist-email' && !preg_match(etemplate_widget_url::EMAIL_PREG, $val))
{ {
self::set_validation_error($form_name,lang("'%1' has an invalid format",$val),''); self::set_validation_error($form_name,lang("'%1' has an invalid format",$val),'');
} }