extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow upgrade of single events to series via SyncML/CalDAV

Browse Source
This commit is contained in:
Jörg Lehrke 2010-05-19 09:20:15 +00:00
parent 6f6415fdc5
commit 8cb71dfc84
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1599,8 +1599,8 @@ class calendar_boupdate extends calendar_bo
$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence']; $matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
} }
} }
} elseif ($event['recur_type'] == $egwEvent['recur_type'] && } elseif ($filter != 'master' && ($filter == 'exact' ||
$filter != 'master' && ($filter == 'exact' || $event['recur_type'] == $egwEvent['recur_type'] &&
strpos($egwEvent['title'], $event['title']) === 0)) strpos($egwEvent['title'], $event['title']) === 0))
{ {
$matchingEvents[] = $egwEvent['id']; // we found the event $matchingEvents[] = $egwEvent['id']; // we found the event

13
calendar/inc/class.calendar_ical.inc.php
View File

@ -1131,6 +1131,12 @@ class calendar_ical extends calendar_boupdate
// common adjustments for existing events // common adjustments for existing events
if (is_array($event_info['stored_event'])) 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'])) if (empty($event['uid']))
{ {
$event['uid'] = $event_info['stored_event']['uid']; // restore the UID if it was not delivered $event['uid'] = $event_info['stored_event']['uid']; // restore the UID if it was not delivered
@ -1385,6 +1391,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 // save event depending on the given event type
switch ($event_info['type']) switch ($event_info['type'])
{ {