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

fixed missing "users" of principal url in calendar-user-address-set

Browse Source
This commit is contained in:
Ralf Becker 2010-10-20 09:42:06 +00:00
parent 54f9421cb8
commit 90f975ff85
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.groupdav.inc.php
View File

@ -252,8 +252,8 @@ class groupdav extends HTTP_WebDAV_Server
$user_prefix = '/'; //.$GLOBALS['egw_info']['user']['account_lid'].'/'; $user_prefix = '/'; //.$GLOBALS['egw_info']['user']['account_lid'].'/';
} }
$calendar_user_address_set = array( $calendar_user_address_set = array(
self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/'), self::mkprop('href','urn:uuid:'.$account['account_lid']),
self::mkprop('href','urn:uuid:'.$account['account_lid'])); );
if ($user < 0) if ($user < 0)
{ {
$principalType = 'groups'; $principalType = 'groups';
@ -265,6 +265,8 @@ class groupdav extends HTTP_WebDAV_Server
$displayname = $account['account_fullname']; $displayname = $account['account_fullname'];
$calendar_user_address_set[] = self::mkprop('href','MAILTO:'.$account['account_email']); $calendar_user_address_set[] = self::mkprop('href','MAILTO:'.$account['account_email']);
} }
$calendar_user_address_set[] = self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');
if ($options['depth'] && $user_prefix == '/') if ($options['depth'] && $user_prefix == '/')
{ {
$displayname = 'EGroupware (Cal|Card|Group)DAV server'; $displayname = 'EGroupware (Cal|Card|Group)DAV server';