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

Fix saving of recurrence exceptions for v2: create unique UIDs, correctly save this-and-future instances with (modified) recurrence rule

Browse source
This commit is contained in:
Thomas Bruederli 2013-03-13 17:39:41 +01:00
parent 2fa154d927
commit 69bc310cc5
1 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
plugins/libkolab/lib/kolab_storage_folder.php
View file

@ -718,28 +718,51 @@ class kolab_storage_folder
// save every exception as individual object // save every exception as individual object
foreach((array)$object['recurrence']['EXCEPTIONS'] as $exception) { foreach((array)$object['recurrence']['EXCEPTIONS'] as $exception) {
$exception['uid'] = $object['uid'] . '-' . $exception['start']->format('Ymd'); $exception['uid'] = self::recurrence_exception_uid($object['uid'], $exception['start']->format('Ymd'));
$exception['recurrence-id'] = $exception['start']->format('Y-m-d');
$exception['sequence'] = $object['sequence'] + 1; $exception['sequence'] = $object['sequence'] + 1;
unset($exception['recurrence'], $exception['organizer'], $exception['attendees']);
$this->save($exception, $type, $exception['uid']);
// set UNTIL date if we have a thisandfuture exception
if ($exception['thisandfuture']) { if ($exception['thisandfuture']) {
$exception['recurrence'] = $object['recurrence'];
// adjust the recurrence duration of the exception
if ($object['recurrence']['COUNT']) {
$recurrence = new kolab_date_recurrence($object['_formatobj']);
if ($end = $recurrence->end()) {
unset($exception['recurrence']['COUNT']);
$exception['recurrence']['UNTIL'] = new DateTime('@'.$end);
}
}
// set UNTIL date if we have a thisandfuture exception
$untildate = clone $exception['start']; $untildate = clone $exception['start'];
$untildate->sub(new DateInterval('P1D')); $untildate->sub(new DateInterval('P1D'));
$object['recurrence']['UNTIL'] = $untildate; $object['recurrence']['UNTIL'] = $untildate;
unset($object['recurrence']['COUNT']); unset($object['recurrence']['COUNT']);
} }
else if (!$exdates[$exception['start']->format('Y-m-d')]) else {
$object['recurrence']['EXDATE'][] = clone $exception['start']; if (!$exdates[$exception['start']->format('Y-m-d')])
$object['recurrence']['EXDATE'][] = clone $exception['start'];
unset($exception['recurrence']);
}
unset($exception['recurrence']['EXCEPTIONS'], $exception['_formatobj'], $exception['_msguid']);
$this->save($exception, $type, $exception['uid']);
} }
unset($object['recurrence']['EXCEPTIONS']); unset($object['recurrence']['EXCEPTIONS']);
} }
} }
/**
* Generate an object UID with the given recurrence-ID in a way that it is
* unique (the original UID is not a substring) but still recoverable.
*/
private static function recurrence_exception_uid($uid, $recurrence_id)
{
$offset = -2;
return substr($uid, 0, $offset) . '-' . $recurrence_id . '-' . substr($uid, $offset);
}
/** /**
* Delete the specified object from this folder. * Delete the specified object from this folder.
* *