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

* Calendar/CalDAV: fix changes on clients creating multiple alarms on server

Browse Source 
fix changing alarm offset on Mac was additional keeping alarm with old offset
also ignoring now X-LIC-ERROR from libical
This commit is contained in:
Ralf Becker 2017-03-31 15:08:04 +02:00
parent af6fe077dd
commit a3154e8de2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1829,6 +1829,7 @@ class calendar_ical extends calendar_boupdate
foreach($event['alarm'] as &$alarm) foreach($event['alarm'] as &$alarm)
{ {
// check if alarm is already stored or from other users // check if alarm is already stored or from other users
$found = false;
foreach($old_alarms as $id => $old_alarm) foreach($old_alarms as $id => $old_alarm)
{ {
// not current users alarm --> ignore // not current users alarm --> ignore
@ -1840,12 +1841,19 @@ class calendar_ical extends calendar_boupdate
// alarm found --> stop // alarm found --> stop
if (empty($alarm['uid']) && $alarm['offset'] == $old_alarm['offset'] || $alarm['uid'] && $alarm['uid'] == $old_alarm['uid']) if (empty($alarm['uid']) && $alarm['offset'] == $old_alarm['offset'] || $alarm['uid'] && $alarm['uid'] == $old_alarm['uid'])
{ {
$found = true;
unset($old_alarms[$id]); unset($old_alarms[$id]);
break; break;
} }
} }
if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) processing ".($found?'existing':'new')." alarm ".array2string($alarm));
if (!empty($alarm['attrs']['X-LIC-ERROR']))
{
if ($this->debug) error_log(__METHOD__."($event[title] (#$event[id]), ..., $user) ignored X-LIC-ERROR=".array2string($alarm['X-LIC-ERROR']));
unset($alarm['attrs']['X-LIC-ERROR']);
}
// alarm not found --> add it // alarm not found --> add it
if ($alarm['offset'] != $old_alarm['offset'] || $old_alarm['owner'] != $user && !$alarm['all']) if (!$found)
{ {
$alarm['owner'] = $user; $alarm['owner'] = $user;
if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset']; if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
@ -1855,7 +1863,7 @@ class calendar_ical extends calendar_boupdate
++$modified; ++$modified;
} }
// existing alarm --> update it // existing alarm --> update it
elseif ($alarm['offset'] == $old_alarm['offset'] && ($old_alarm['owner'] == $user || $old_alarm['all'])) else
{ {
if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset']; if (!isset($alarm['time'])) $alarm['time'] = $event['start'] - $alarm['offset'];
if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm); if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);