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

loop over existing addressbooks, to make sure each ab is only once in addressbook-home-set, even when selected multiple times in the prefs because of symbolic ab like "primary group"

Browse Source
This commit is contained in:
Ralf Becker 2010-10-20 13:23:19 +00:00
parent b55bb74988
commit 20fb58dd6a
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
phpgwapi/inc/class.groupdav_principals.inc.php
View File

@ -257,37 +257,31 @@ class groupdav_principals extends groupdav_handler
$prefs = $GLOBALS['egw_info']['user']['preferences']['groupdav'];
$addressbook_home_set = $prefs['addressbook-home-set'];
if (empty($addressbook_home_set)) $addressbook_home_set = 'P'; // personal addressbook
if (strpos($addressbook_home_set,'A') !== false)
$addressbook_home_set = explode(',',$addressbook_home_set);
// replace symbolic id's with real nummeric id's
foreach(array(
'P' => $GLOBALS['egw_info']['user']['account_id'],
'G' => $GLOBALS['egw_info']['user']['account_primary_group'],
'U' => '0',
) as $sym => $id)
{
$addressbook_home_set = array_keys(ExecMethod('addressbook.addressbook_bo.get_addressbooks',EGW_ACL_READ));
}
else
{
$addressbook_home_set = explode(',',$addressbook_home_set);
}
foreach($addressbook_home_set as $id)
{
switch($id)
if (($key = array_search($sym, $addressbook_home_set)) !== false)
{
case 'P':
$id = $GLOBALS['egw_info']['user']['account_id'];
break;
case 'G':
$id = $GLOBALS['egw_info']['user']['account_primary_group'];
break;
case 'O': // "all in one" from groupdav.php/addressbook/
$addressbooks[] = HTTP_WebDAV_Server::mkprop('href',
$this->base_uri.'/');
continue 2;
}
if (is_numeric($id) && ($owner = $GLOBALS['egw']->accounts->id2name($id)))
{
$addressbooks[] = HTTP_WebDAV_Server::mkprop('href',
$this->base_uri.'/'.$owner.'/');
$addressbook_home_set[$key] = $id;
}
}
if (in_array('O',$addressbook_home_set)) // "all in one" from groupdav.php/addressbook/
{
$addressbooks[] = HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/');
}
foreach(ExecMethod('addressbook.addressbook_bo.get_addressbooks',EGW_ACL_READ) as $id => $label)
{
if ((in_array('A',$addressbook_home_set) || in_array((string)$id,$addressbook_home_set)) &&
is_numeric($id) && ($owner = $GLOBALS['egw']->accounts->id2name($id)))
{
$addressbooks[] = HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$owner.'/');
}
}
$cal_bo = new calendar_bo();
foreach ($cal_bo->list_cals() as $label => $entry)
{