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

php5 erroring on call to private function add() - moved to class function list_cals_add()

Browse Source
This commit is contained in:
Miles Lott 2004-02-20 15:14:29 +00:00
parent 2f32ca43b2
commit 9cff33854d
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
calendar/inc/class.bocalendar.inc.php
View File

@ -2886,6 +2886,25 @@
return $ret; return $ret;
} }
/* This is called only by list_cals(). It was moved here to remove fatal error in php5 beta4 */
function list_cals_add($id,&$users,&$groups)
{
$name = $GLOBALS['phpgw']->common->grab_owner_name($id);
if (($type = $GLOBALS['phpgw']->accounts->get_type($id)) == 'g')
{
$arr = &$groups;
}
else
{
$arr = &$users;
}
$arr[$name] = Array(
'grantor' => $id,
'value' => ($type == 'g' ? 'g_' : '') . $id,
'name' => $name
);
}
/*! /*!
@function list_cals @function list_cals
@abstract generate list of user- / group-calendars for the selectbox in the header @abstract generate list of user- / group-calendars for the selectbox in the header
@ -2893,39 +2912,22 @@
*/ */
function list_cals() function list_cals()
{ {
function add($id,&$users,&$groups)
{
$name = $GLOBALS['phpgw']->common->grab_owner_name($id);
if (($type = $GLOBALS['phpgw']->accounts->get_type($id)) == 'g')
{
$arr = &$groups;
}
else
{
$arr = &$users;
}
$arr[$name] = Array(
'grantor' => $id,
'value' => ($type == 'g' ? 'g_' : '') . $id,
'name' => $name
);
}
$users = $groups = array(); $users = $groups = array();
foreach($this->grants as $id => $rights) foreach($this->grants as $id => $rights)
{ {
add($id,$users,$groups); $this->list_cals_add($id,$users,$groups);
} }
if ($memberships = $GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id'])) if ($memberships = $GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']))
{ {
foreach($memberships as $group_info) foreach($memberships as $group_info)
{ {
add($group_info['account_id'],$users,$groups); $this->list_cals_add($group_info['account_id'],$users,$groups);
if ($account_perms = $GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar')) if ($account_perms = $GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar'))
{ {
foreach($account_perms as $id) foreach($account_perms as $id)
{ {
add($id,$users,$groups); $this->list_cals_add($id,$users,$groups);
} }
} }
} }