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

* CalDAV: alarms on recurring events are lost when snoozing alarm or reloading event after 1. recurrence of alarm

Browse Source
This commit is contained in:
Ralf Becker 2017-09-21 17:52:25 +02:00
parent 3cc0012c77
commit 12bcc92f70
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -677,6 +677,8 @@ class calendar_groupdav extends Api\CalDAV\Handler
if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']); if (isset($expand['end'])) $expand['end'] = $this->vCalendar->_parseDateTime($expand['end']);
} }
$events =& self::get_series($event['uid'], $this->bo, $expand, $user); $events =& self::get_series($event['uid'], $this->bo, $expand, $user);
// as alarm is now only on next recurrence, set alarm from original event on master
if ($event['alarm']) $events[0]['alarm'] = $event['alarm'];
} }
elseif(!$this->client_shared_uid_exceptions && $event['reference']) elseif(!$this->client_shared_uid_exceptions && $event['reference'])
{ {
@ -733,6 +735,11 @@ class calendar_groupdav extends Api\CalDAV\Handler
foreach($events as $k => &$recurrence) foreach($events as $k => &$recurrence)
{ {
//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence)); //error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));
if ($master && $recurrence['reference'] != $master['id'])
{
unset($events[$k]);
continue; // same uid, but references a different event or is own master
}
if (!$master || $recurrence['id'] != $master['id']) // real exception if (!$master || $recurrence['id'] != $master['id']) // real exception
{ {
// user is NOT participating in this exception // user is NOT participating in this exception