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

* Calendar/CalDAV: fixed not synced recurrences, because invitation was to a group only or first recurrence was an exception

Browse Source
This commit is contained in:
Ralf Becker 2015-01-27 18:11:40 +00:00
parent 45c3daf713
commit d057db1607
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
calendar/inc/class.calendar_groupdav.inc.php
View File

@ -647,24 +647,28 @@ class calendar_groupdav extends groupdav_handler
$events =& $bo->search($params); $events =& $bo->search($params);
// find master, which is not always first event, eg. when first event is an exception
$master = null; $master = null;
foreach($events as $k => &$recurrence) foreach($events as $k => &$recurrence)
{ {
if (!isset($master)) // first event is master if ($recurrence['recur_type'])
{ {
$master = $recurrence; $master = $recurrence;
$exceptions =& $master['recur_exception']; $exceptions =& $master['recur_exception'];
unset($events[$k]); unset($events[$k]);
continue; break;
} }
}
foreach($events as $k => &$recurrence)
{
//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence)); //error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));
if ($recurrence['id'] != $master['id']) // real exception if ($recurrence['id'] != $master['id']) // real exception
{ {
// user is NOT participating in this exception // user is NOT participating in this exception
if ($user && !isset($recurrence['participants'][$user])) if ($user && !self::isParticipant($recurrence, $user))
{ {
// if he is NOT in master, delete this exception // if he is NOT in master, delete this exception
if (!isset($master['participants'][$user])) if (!self::isParticipant($master, $user))
{ {
unset($events[$k]); unset($events[$k]);
continue; continue;
@ -698,15 +702,27 @@ class calendar_groupdav extends groupdav_handler
// not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start']; // not for included exceptions (Lightning): $master['recur_exception'][] = $recurrence['start'];
} }
// only add master if we are not expanding and current user participates in master (and not just some exceptions) // only add master if we are not expanding and current user participates in master (and not just some exceptions)
if (!$expand && (!$user || isset($master['participants'][$user]) || if (!$expand && (!$user || self::isParticipant($master, $user)))
// for group-invitations we need to check memberships of $user too
array_intersect(array_keys($master['participants']), $GLOBALS['egw']->accounts->memberships($user, true))))
{ {
$events = array_merge(array($master), $events); $events = array_merge(array($master), $events);
} }
return $events; return $events;
} }
/**
* Check if $user is a participant of given $event incl. group-invitations
*
* @param array $event
* @param int|string $user
* @return boolean
*/
public static function isParticipant(array $event, $user)
{
return isset($event['participants'][$user]) ||
// for group-invitations we need to check memberships of $user too
array_intersect(array_keys($event['participants']), $GLOBALS['egw']->accounts->memberships($user, true));
}
/** /**
* Handle put request for an event * Handle put request for an event
* *