holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

outbox supports VFREEBUSY too, it is required from OS X iCal to autocomplete locations

Browse Source
This commit is contained in:
Ralf Becker 2012-01-30 23:53:06 +00:00
parent d7a953a60c
commit f2acf7707f
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1163,20 +1163,27 @@ class calendar_groupdav extends groupdav_handler
* @param string $displayname * @param string $displayname
* @param string $base_uri=null base url of handler * @param string $base_uri=null base url of handler
* @param int $user=null account_id of owner of current collection * @param int $user=null account_id of owner of current collection
* @param string $path=null path of the collection
* @return array * @return array
*/ */
public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null) public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null, $path=null)
{ {
if (!isset($props['calendar-description'])) if (!isset($props['calendar-description']))
{ {
// default calendar description: can be overwritten via PROPPATCH, in which case it's already set // default calendar description: can be overwritten via PROPPATCH, in which case it's already set
$props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname); $props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname);
} }
// supported components, currently only VEVENT $supported_components = array(
$props['supported-calendar-component-set'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-component-set',array(
HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VCALENDAR')), HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VCALENDAR')),
HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VEVENT')), HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VEVENT')),
)); );
// outbox supports VFREEBUSY too, it is required from OS X iCal to autocomplete locations
if (substr($path,-8) == '/outbox/')
{
$supported_components[] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VFREEBUSY'));
}
$props['supported-calendar-component-set'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,
'supported-calendar-component-set',$supported_components);
$props['supported-report-set'] = HTTP_WebDAV_Server::mkprop('supported-report-set',array( $props['supported-report-set'] = HTTP_WebDAV_Server::mkprop('supported-report-set',array(
HTTP_WebDAV_Server::mkprop('supported-report',array( HTTP_WebDAV_Server::mkprop('supported-report',array(
HTTP_WebDAV_Server::mkprop('report',array( HTTP_WebDAV_Server::mkprop('report',array(

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

@ -851,7 +851,7 @@ class groupdav extends HTTP_WebDAV_Server
{ {
if (method_exists($handler,'extra_properties')) if (method_exists($handler,'extra_properties'))
{ {
$props = $handler->extra_properties($props,$this->account_name($account),$this->base_uri,$user); $props = $handler->extra_properties($props,$this->account_name($account),$this->base_uri,$user,$path);
} }
// add ctag if handler implements it // add ctag if handler implements it
if (method_exists($handler,'getctag') && $this->prop_requested('getctag') === true) if (method_exists($handler,'getctag') && $this->prop_requested('getctag') === true)