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

fix searching for "group" reveals groups normally hidden by forced account-selection pref "groupmembers" or "none"

Browse Source
This commit is contained in:
Ralf Becker 2016-10-31 18:46:59 +01:00
parent 3bfbf26cfa
commit 225bc0bbc2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/Accounts.php
View File

@ -201,7 +201,16 @@ class Accounts
$group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ',$param['query']))); $group_index = array_search(strtolower(lang('Group')), array_map('strtolower', $query = explode(' ',$param['query'])));
if($group_index !== FALSE) if($group_index !== FALSE)
{ {
$param['type'] = 'groups'; // do not return any groups for account-selection == "none"
if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'none' &&
!isset($GLOBALS['egw_info']['user']['apps']['admin']))
{
$this->total = 0;
return array();
}
// only return own memberships for account-selection == "groupmembers"
$param['type'] = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] === 'groupmembers' &&
!isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'owngroups' : 'groups';
// Remove the 'group' from the query, but only one (eg: Group NoGroup -> NoGroup) // Remove the 'group' from the query, but only one (eg: Group NoGroup -> NoGroup)
unset($query[$group_index]); unset($query[$group_index]);
$param['query'] = implode(' ', $query); $param['query'] = implode(' ', $query);