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

Enable ../groupdav.php/calendar/ again

Browse Source
This commit is contained in:
Jörg Lehrke 2010-04-16 21:53:01 +00:00
parent 66656bf9c5
commit 0949389d57
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -772,8 +772,8 @@ class calendar_groupdav extends groupdav_handler
{ {
// calendar description // calendar description
$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname); $props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname);
// BOX URLs of the current user
/* /*
// BOX URLs of the current user
$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-inbox-URL', $props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-inbox-URL',
array(HTTP_WebDAV_Server::mkprop(self::DAV,'href',$base_uri.'/calendar/'))); array(HTTP_WebDAV_Server::mkprop(self::DAV,'href',$base_uri.'/calendar/')));
$props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-outbox-URL', $props[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-outbox-URL',

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

@ -375,11 +375,9 @@ class groupdav extends HTTP_WebDAV_Server
$props = array( $props = array(
self::mkprop('current-user-principal',array(self::mkprop('href',$this->principalURL))), self::mkprop('current-user-principal',array(self::mkprop('href',$this->principalURL))),
self::mkprop('owner',array(self::mkprop('href',$this->base_uri.'/principals/users/'.$account_lid.'/'))), self::mkprop('owner',array(self::mkprop('href',$this->base_uri.'/principals/users/'.$account_lid.'/'))),
self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))), //self::mkprop('principal-URL',array(self::mkprop('href',$this->principalURL))),
self::mkprop('alternate-URI-set',array( self::mkprop('alternate-URI-set',array(
self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']))), self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']))),
self::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
self::mkprop('href','MAILTO:'.$GLOBALS['egw_info']['user']['email']))),
self::mkprop('principal-collection-set',array( self::mkprop('principal-collection-set',array(
self::mkprop('href',$this->base_uri.'/principals/users/'), self::mkprop('href',$this->base_uri.'/principals/users/'),
self::mkprop('href',$this->base_uri.'/principals/groups/'), self::mkprop('href',$this->base_uri.'/principals/groups/'),
@ -388,6 +386,10 @@ class groupdav extends HTTP_WebDAV_Server
switch ($app) switch ($app)
{ {
case 'calendar':
$props[] = self::mkprop(groupdav::CALDAV,'calendar-home-set',array(
self::mkprop('href',$this->base_uri.$path.'calendar/')));
break;
case 'infolog': case 'infolog':
$props[] = self::mkprop(groupdav::CALDAV,'calendar-home-set',array( $props[] = self::mkprop(groupdav::CALDAV,'calendar-home-set',array(
self::mkprop('href',$this->base_uri.$path.'infolog/'))); self::mkprop('href',$this->base_uri.$path.'infolog/')));