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

cast accounts->members(hips) to array, to cope without PHP warnings for not (longer) existing accounts

Browse Source
This commit is contained in:
Ralf Becker 2012-08-09 08:56:28 +00:00
parent 46f700851a
commit 51270655f9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpgwapi/inc/class.accounts.inc.php
View File

@ -271,9 +271,9 @@ class accounts
elseif(in_array($param['type'],array('groupmembers','groupmembers+memberships')))
{
$members = array();
foreach($this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
foreach((array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true) as $grp)
{
$members = array_unique(array_merge($members,$this->members($grp,true)));
$members = array_unique(array_merge($members, (array)$this->members($grp,true)));
if ($param['type'] == 'groupmembers+memberships') $members[] = $grp;
}
$param['type'] = $param['type'] == 'groupmembers+memberships' ? 'both' : 'accounts';
@ -663,8 +663,8 @@ class accounts
$account_lid != $GLOBALS['egw_info']['user']['account_lid'] ||
// only allow group-members for account-selection is groupmembers
$GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
!array_intersect($this->memberships($account_id,true),
$this->memberships($GLOBALS['egw_info']['user']['account_id'],true))))
!array_intersect((array)$this->memberships($account_id,true),
(array)$this->memberships($GLOBALS['egw_info']['user']['account_id'],true))))
{
//error_log(__METHOD__."($account_id='$account_lid') returning FALSE");
return false; // user is not allowed to see given account
@ -793,7 +793,7 @@ class accounts
$accounts['groups'][$id] = $id;
if ($use != 'groups')
{
foreach($this->members($id,true) as $id)
foreach((array)$this->members($id,true) as $id)
{
$accounts['accounts'][$id] = $id;
}