extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-23 03:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Calendar: Fix iCal import with mismatched recurrence date did not properly create exception

Browse Source
This commit is contained in:
nathan 2023-11-10 14:32:41 -07:00
parent 7e8380698a
commit 1396ba6fd4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1573,7 +1573,7 @@ class calendar_boupdate extends calendar_bo
$event['created'] = $save_event['created'] = $this->now; $event['created'] = $save_event['created'] = $this->now;
$event['creator'] = $save_event['creator'] = $this->user; $event['creator'] = $save_event['creator'] = $this->user;
} }
$set_recurrences = $old_event ? abs(Api\DateTime::to($event['recur_enddate']??null, 'utc') - Api\DateTime::to($old_event['recur_enddate']??null, 'utc')) > 1 : false; $set_recurrences = $old_event ? abs(Api\DateTime::to($event['recur_enddate'] ?? null, 'utc') - Api\DateTime::to($old_event['recur_enddate'] ?? null, 'utc')) > 1 || count($old_event['recur_exception']) != count($event['recur_exception']) : false;
$set_recurrences_start = 0; $set_recurrences_start = 0;
if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE) if (($cal_id = $this->so->save($event,$set_recurrences,$set_recurrences_start,0,$event['etag'])) && $set_recurrences && $event['recur_type'] != MCAL_RECUR_NONE)
{ {
@ -2931,7 +2931,7 @@ class calendar_boupdate extends calendar_bo
* the corresponding series master event array * the corresponding series master event array
* NOTE: this param is false if event is of type SERIES-MASTER * NOTE: this param is false if event is of type SERIES-MASTER
*/ */
function get_event_info($event) function get_event_info(&$event)
{ {
$type = 'SINGLE'; // default $type = 'SINGLE'; // default
$master_event = false; //default $master_event = false; //default
@ -3008,7 +3008,8 @@ class calendar_boupdate extends calendar_bo
else else
{ {
// try to find a suitable pseudo exception date // try to find a suitable pseudo exception date
$egw_rrule = calendar_rrule::event2rrule($master_event, false); // Checks are all in server time
$egw_rrule = calendar_rrule::event2rrule($master_event, false, $GLOBALS['egw_info']['server']['server_timezone']);
$egw_rrule->current = clone $egw_rrule->time; $egw_rrule->current = clone $egw_rrule->time;
while ($egw_rrule->valid()) while ($egw_rrule->valid())
{ {
@ -3023,7 +3024,8 @@ class calendar_boupdate extends calendar_bo
{ {
$type = 'SERIES-PSEUDO-EXCEPTION'; // let's try a pseudo exception $type = 'SERIES-PSEUDO-EXCEPTION'; // let's try a pseudo exception
$recurrence_event = $master_event; $recurrence_event = $master_event;
$recurrence_event['start'] = $occurrence; // Update the event's recurrence too
$recurrence_event['start'] = $event['recurrence'] = $occurrence;
$recurrence_event['end'] -= $master_event['start'] - $occurrence; $recurrence_event['end'] -= $master_event['start'] - $occurrence;
break 2; break 2;
} }