From d25f9dce25fa2312648b50befac1c50159319c00 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 31 Oct 2013 11:29:44 +0000 Subject: [PATCH] * CalDAV: fixed wrong http-status for delete in inbox and announce sync-report on inbox, so clients using it get events only once --- calendar/inc/class.calendar_groupdav.inc.php | 4 ++-- phpgwapi/inc/class.groupdav.inc.php | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index f119d49d7b..4ffeba8594 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -1429,8 +1429,8 @@ class calendar_groupdav extends groupdav_handler HTTP_WebDAV_Server::mkprop('report',array( HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'free-busy-query',''))))), ); - // 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)) + // rfc 6578 sync-collection report for everything but outbox + if (strpos($path, '/outbox/') === false) { $props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report',array( HTTP_WebDAV_Server::mkprop('report',array( diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php index b429c741a1..c47d9e75a4 100644 --- a/phpgwapi/inc/class.groupdav.inc.php +++ b/phpgwapi/inc/class.groupdav.inc.php @@ -1556,6 +1556,11 @@ class groupdav extends HTTP_WebDAV_Server { $user_prefix = '/'.$user; $user = $account_id; + // //inbox/ + if ($user == $GLOBALS['egw_info']['user']['account_id'] && $app == 'inbox') + { + $app = 'calendar'; + } } else {