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

* CalDAV: work around problems with Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)

Browse Source 
- sends a DELETE to reject a meeting request --> deletes event for all participants, if user has delete rights on the calendar
- always sends all participants back with status NEEDS-ACTION --> resets status of all participant, if user has edit rights
--> remove all add, edit, delete rights from other users
This commit is contained in:
Ralf Becker 2018-09-20 15:56:19 +02:00
parent 9e1d9e143e
commit f7d09e9ec0
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/CalDAV/Handler.php
View File

@ -453,6 +453,7 @@ abstract class Handler
'ical4ol' => 'ical4ol', // iCal4OL client 'ical4ol' => 'ical4ol', // iCal4OL client
'evolution' => 'evolution', // Evolution 'evolution' => 'evolution', // Evolution
'thunderbird' => 'thunderbird', // SOGo connector for addressbook, no Lightning installed 'thunderbird' => 'thunderbird', // SOGo connector for addressbook, no Lightning installed
'caldavsynchronizer'=> 'caldavsynchronizer', // Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)
) as $pattern => $name) ) as $pattern => $name)
{ {
if (strpos($user_agent,$pattern) !== false) if (strpos($user_agent,$pattern) !== false)

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

@ -98,6 +98,21 @@ class calendar_groupdav extends Api\CalDAV\Handler
$this->bo = new calendar_boupdate(); $this->bo = new calendar_boupdate();
$this->vCalendar = new Horde_Icalendar; $this->vCalendar = new Horde_Icalendar;
if (self::get_agent() == 'caldavsynchronizer')
{
// Work around problems with Outlook CalDAV Synchroniser (https://caldavsynchronizer.org/)
// - sends a DELETE to reject a meeting request --> deletes event for all participants, if user has delete rights on the calendar
// - always sends all participants back with status NEEDS-ACTION --> resets status of all participant, if user has edit rights
// --> remove all add, edit, delete rights from other users
foreach($this->bo->grants as $user => &$grant)
{
if ($user != $this->bo->user)
{
$grant &= ~(Api\Acl::ADD | Api\Acl::EDIT | Api\Acl::DELETE);
}
}
}
// since 1.9.003 we allow clients to specify the URL when creating a new event, as specified by CalDAV // since 1.9.003 we allow clients to specify the URL when creating a new event, as specified by CalDAV
if (version_compare($GLOBALS['egw_info']['apps']['calendar']['version'], '1.9.003', '>=')) if (version_compare($GLOBALS['egw_info']['apps']['calendar']['version'], '1.9.003', '>='))
{ {
@ -107,6 +122,18 @@ class calendar_groupdav extends Api\CalDAV\Handler
} }
/** /**
* Get grants of current user and app
*
* Overwritten to return rights modified for certain user-agents (eg. Outlook CalDAV Synchroniser) in the consturctor.
*
* @return array user-id => Api\Acl::ADD|Api\Acl::READ|Api\Acl::EDIT|Api\Acl::DELETE pairs
*/
public function get_grants()
{
return $this->bo->grants;
}
/**
* Create the path for an event * Create the path for an event
* *
* @param array|int $event * @param array|int $event