From 0af9ed0cd92f29ab12950890c3bc97a80f109cdf Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 2 Oct 2012 10:35:12 +0000 Subject: [PATCH] disable sync-collection report for inbox and outbox, as the way they are created in EGw, we cant support sync-collection propperly we filter by status unknown, but do not report event as deleted, when status changed to accepted --- calendar/inc/class.calendar_groupdav.inc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index 14cc2fa016..40d69583f4 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -1312,11 +1312,14 @@ class calendar_groupdav extends groupdav_handler 'free-busy-query' => HTTP_WebDAV_Server::mkprop('supported-report',array( HTTP_WebDAV_Server::mkprop('report',array( HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'free-busy-query',''))))), - // rfc 6578 sync-collection report - 'sync-collection' => HTTP_WebDAV_Server::mkprop('supported-report',array( - HTTP_WebDAV_Server::mkprop('report',array( - HTTP_WebDAV_Server::mkprop('sync-collection',''))))), ); + // rfc 6578 sync-collection report, not for inbox, as we dont report accepted events as deleted, because we filter! + if (!preg_match('#/(inbox|outbox)/#', $path)) + { + $props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report',array( + HTTP_WebDAV_Server::mkprop('report',array( + HTTP_WebDAV_Server::mkprop('sync-collection',''))))); + } $props['supported-calendar-data'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-data',array( HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/calendar', 'version'=> '2.0')), HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-data', array('content-type' => 'text/x-calendar', 'version'=> '1.0'))));