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

fixed validation for select-account to work on actual value and attribute account_type and not on options send by server

Browse Source
This commit is contained in:
Ralf Becker 2014-04-17 12:46:27 +00:00
parent f26a140a01
commit 0b9bffc40c
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -77,6 +77,7 @@ class etemplate_widget_menupopup extends etemplate_widget
public function validate($cname, array $expand, array $content, &$validated=array()) public function validate($cname, array $expand, array $content, &$validated=array())
{ {
$form_name = self::form_name($cname, $this->id, $expand); $form_name = self::form_name($cname, $this->id, $expand);
$widget_type = $this->attrs['type'] ? $this->attrs['type'] : $this->type;
$ok = true; $ok = true;
if (!$this->is_readonly($cname, $form_name)) if (!$this->is_readonly($cname, $form_name))
@ -85,20 +86,38 @@ class etemplate_widget_menupopup extends etemplate_widget
$allowed = self::selOptions($form_name, true); // true = return array of option-values $allowed = self::selOptions($form_name, true); // true = return array of option-values
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)
{ {
// array_key_exists() (used below) is inconsistent in how it handles empty/false switch ($widget_type)
// It needs a string or integer.
if(!$val && $val !== 0) $val = '';
// Special for select-account - selOptions doesn't always load all accounts
if($this->attrs['type'] == 'select-account' && !$GLOBALS['egw']->accounts->visible($val) && !in_array($val, $allowed) ||
$this->attrs['type'] != 'select-account' && !in_array($val, $allowed))
{ {
self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!", $val, implode("','",$allowed)),''); case 'select-account': // validate accounts independent of options know to server
$value = ''; $account_type = $this->attrs['account_type'] ? $this->attrs['account_type'] : 'accounts';
break; $type = $GLOBALS['egw']->accounts->exists($val);
//error_log(__METHOD__."($cname,...) form_name=$form_name, widget_type=$widget_type, account_type=$account_type, type=$type");
if (!$type || $type == 1 && in_array($account_type, array('groups', 'owngroups', 'memberships')) ||
$type == 2 && $account_type == 'users' ||
in_array($account_type, array('owngroups', 'memberships')) &&
!in_array($val, $GLOBALS['egw']->accounts->memberships(
$GLOBALS['egw_info']['user']['account_id'], true)))
{
self::set_validation_error($form_name, lang("'%1' is NOT allowed ('%2')!", $val,
!$type?'not found' : ($type == 1 ? 'user' : 'group')),'');
$value = '';
break 2;
}
break;
default:
// array_key_exists() (used below) is inconsistent in how it handles empty/false
// It needs a string or integer.
if(!$val && $val !== 0) $val = '';
if(!in_array($val, $allowed))
{
self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!", $val, implode("','",$allowed)),'');
$value = '';
break 2;
}
} }
} }
if ($ok && $value === '' && $this->attrs['needed']) if ($ok && $value === '' && $this->attrs['needed'])
@ -107,7 +126,7 @@ class etemplate_widget_menupopup extends etemplate_widget
} }
// some widgets sub-types need some post-processing // some widgets sub-types need some post-processing
// ToDo: move it together with preprocessing to clientside // ToDo: move it together with preprocessing to clientside
switch ($this->attrs['type']) switch ($widget_type)
{ {
case 'select-dow': case 'select-dow':
$dow = 0; $dow = 0;