mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:07 +01:00
Allow upgrade of single events to series via SyncML/CalDAV
This commit is contained in:
parent
6f6415fdc5
commit
8cb71dfc84
@ -1599,8 +1599,8 @@ class calendar_boupdate extends calendar_bo
|
||||
$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
|
||||
}
|
||||
}
|
||||
} elseif ($event['recur_type'] == $egwEvent['recur_type'] &&
|
||||
$filter != 'master' && ($filter == 'exact' ||
|
||||
} elseif ($filter != 'master' && ($filter == 'exact' ||
|
||||
$event['recur_type'] == $egwEvent['recur_type'] &&
|
||||
strpos($egwEvent['title'], $event['title']) === 0))
|
||||
{
|
||||
$matchingEvents[] = $egwEvent['id']; // we found the event
|
||||
|
@ -1131,6 +1131,12 @@ class calendar_ical extends calendar_boupdate
|
||||
// common adjustments for existing events
|
||||
if (is_array($event_info['stored_event']))
|
||||
{
|
||||
if ($this->log)
|
||||
{
|
||||
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__
|
||||
. "(UPDATE Event)\n"
|
||||
. array2string($event_info['stored_event'])."\n",3,$this->logfile);
|
||||
}
|
||||
if (empty($event['uid']))
|
||||
{
|
||||
$event['uid'] = $event_info['stored_event']['uid']; // restore the UID if it was not delivered
|
||||
@ -1384,6 +1390,13 @@ class calendar_ical extends calendar_boupdate
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($this->log)
|
||||
{
|
||||
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__ . '('
|
||||
. $event_info['type'] . ")\n"
|
||||
. array2string($event)."\n",3,$this->logfile);
|
||||
}
|
||||
|
||||
// save event depending on the given event type
|
||||
switch ($event_info['type'])
|
||||
|
Loading…
Reference in New Issue
Block a user