Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Skip regular recurrences on exception dates

Browse source
This commit is contained in:
Thomas Bruederli 2013-01-23 17:17:05 +01:00
parent 91779df09a
commit 1b4b6bb965
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -421,6 +421,7 @@ class kolab_calendar
// add recurrence exceptions to output // add recurrence exceptions to output
$i = 0; $i = 0;
$events = array(); $events = array();
$exdates = array();
if (is_array($event['recurrence']['EXCEPTIONS'])) { if (is_array($event['recurrence']['EXCEPTIONS'])) {
foreach ($event['recurrence']['EXCEPTIONS'] as $exception) { foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
$rec_event = $this->_to_rcube_event($exception); $rec_event = $this->_to_rcube_event($exception);
@ -429,10 +430,14 @@ class kolab_calendar
$rec_event['_instance'] = $i; $rec_event['_instance'] = $i;
$events[] = $rec_event; $events[] = $rec_event;
// found the specifically requested instance, exiting...
if ($rec_event['id'] == $event_id) { if ($rec_event['id'] == $event_id) {
$this->events[$rec_event['id']] = $rec_event; $this->events[$rec_event['id']] = $rec_event;
return $events; return $events;
} }
// remember this exception's date
$exdates[$rec_event['start']->format('Y-m-d')] = $rec_event['id'];
} }
} }
@ -447,11 +452,12 @@ class kolab_calendar
} }
while ($next_event = $recurrence->next_instance()) { while ($next_event = $recurrence->next_instance()) {
$rec_start = $next_event['start']->format('U'); // skip if there's an exception at this date
$rec_end = $next_event['end']->format('U'); if ($exdates[$next_event['start']->format('Y-m-d')])
$rec_id = $event['uid'] . '-' . ++$i; continue;
// add to output if in range // add to output if in range
$rec_id = $event['uid'] . '-' . ++$i;
if (($next_event['start'] <= $end && $next_event['end'] >= $start) || ($event_id && $rec_id == $event_id)) { if (($next_event['start'] <= $end && $next_event['end'] >= $start) || ($event_id && $rec_id == $event_id)) {
$rec_event = $this->_to_rcube_event($next_event); $rec_event = $this->_to_rcube_event($next_event);
$rec_event['id'] = $rec_id; $rec_event['id'] = $rec_id;