extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* CalDAV: fixed wrong http-status for delete in inbox and announce sync-report on inbox, so clients using it get events only once

Browse Source
This commit is contained in:
Ralf Becker 2013-10-31 11:29:22 +00:00
parent 7baddc4d39
commit b20bd49817
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1440,8 +1440,8 @@ class calendar_groupdav extends groupdav_handler
HTTP_WebDAV_Server::mkprop('report',array( HTTP_WebDAV_Server::mkprop('report',array(
HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'free-busy-query',''))))), 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! // rfc 6578 sync-collection report for everything but outbox
if (!preg_match('#/(inbox|outbox)/#', $path)) if (strpos($path, '/outbox/') === false)
{ {
$props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report',array( $props['supported-report-set']['sync-collection'] = HTTP_WebDAV_Server::mkprop('supported-report',array(
HTTP_WebDAV_Server::mkprop('report',array( HTTP_WebDAV_Server::mkprop('report',array(

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

@ -1875,6 +1875,11 @@ class groupdav extends HTTP_WebDAV_Server
{ {
$user_prefix = '/'.$user; $user_prefix = '/'.$user;
$user = $account_id; $user = $account_id;
// /<currentuser>/inbox/
if ($user == $GLOBALS['egw_info']['user']['account_id'] && $app == 'inbox')
{
$app = 'calendar';
}
} }
else else
{ {