extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +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 09:02:50 +00:00
parent 51270655f9
commit 188e2f8038
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/inc/class.uiaccountsel.inc.php
View File

@ -150,12 +150,12 @@ class uiaccountsel
}
else
{
$memberships = $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
$memberships = (array)$this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
}
$select = count($selected) && !isset($selected[0]) ? array_keys($selected) : $selected;
foreach($memberships as $gid)
{
foreach($this->accounts->members($gid,true) as $member)
foreach((array)$this->accounts->members($gid,true) as $member)
{
if (!in_array($member,$select)) $select[] = $member;
}
@ -164,7 +164,7 @@ class uiaccountsel
{
if ($account_sel == 'primary_group')
{
$memberships = $this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
$memberships = (array)$this->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
}
$select = array_merge($select,$memberships);
}
@ -178,6 +178,7 @@ class uiaccountsel
'type' => $use,
'app' => $app,
));
//error_log(__METHOD__."() account_selection='$this->account_selection', accounts->search(array('type'=>'$use', 'app' => '$app')) returns ".array2string($select));
}
// make sure everything in $selected is also in $select, as in the other account-selection methods
if ($selected && ($missing = array_diff_key($selected,$select)))
@ -270,6 +271,7 @@ class uiaccountsel
$select2 += $select;
$select =& $select2; unset($select2);
}
//error_log(__METHOD__."(..., use='$use', ...) account_selection='$this->account_selection', select=".array2string($select));
if ($nohtml)
{