holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved find_event() for propper pseudo recurrence exception handling during Slow Syncs

Browse Source
This commit is contained in:
Jörg Lehrke 2009-09-24 22:29:22 +00:00
parent d9531fb421
commit 327bd79662
1 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1120,44 +1120,71 @@ class calendar_boupdate extends calendar_bo
*/ */
function find_event($event, $relax=false) function find_event($event, $relax=false)
{ {
$query = array(
'cal_start='.$event['start'],
'cal_end='.$event['end'],
);
foreach (array('title', 'location',
'public', 'non_blocking', 'category') as $key)
{
if (!empty($event[$key])) $query['cal_'.$key] = $event[$key];
}
if ($event['uid'] && ($uidmatch = $this->read($event['uid']))) if ($event['uid'] && ($uidmatch = $this->read($event['uid'])))
{ {
if ($event['recurrence'] if ($event['recurrence'])
&& ($egw_event = $this->read($uidmatch['id'], $event['recurrence'])))
{ {
// Do we work with a "status only" exception here? // Let's try to find a real exception first
$match = true; $query['cal_uid'] = $event['uid'];
foreach (array('start','end','title','description','priority', $query['cal_recurrence'] = $event['recurrence'];
'location','public','non_blocking') as $name)
if($foundEvents = parent::search(array(
'query' => $query,
)))
{ {
if (isset($event[$name]) if(is_array($foundEvents))
&& $event[$name] != $egw_event[$name])
{ {
$match = false; $event = array_shift($foundEvents);
break; return $event['id'];
} }
} }
if ($match) // Let's try the "status only" (pseudo) exceptions now
if (($egw_event = $this->read($uidmatch['id'], $event['recurrence'])))
{ {
//return ($uidmatch['id'] . ':' . $event['reference']); // Do we work with a pseudo exception here?
foreach ($event['participants'] as $attendee => $status) $match = true;
foreach (array('start', 'end', 'title', 'description', 'priority',
'location', 'public', 'non_blocking') as $key)
{ {
if (!isset($egw_event['participants'][$attendee]) if (isset($event[$key])
|| $egw_event['participants'][$attendee] != $status) && $event[$key] != $egw_event[$key])
{ {
$match = false; $match = false;
break; break;
} }
else
{
unset($egw_event['participants'][$attendee]);
}
} }
if ($match && !empty($egw_event['participants'])) $match = false; if ($match && is_array($event['participants']))
} {
if ($match) return ($uidmatch['id'] . ':' . $event['recurrence']); foreach ($event['participants'] as $attendee => $status)
{
if (!isset($egw_event['participants'][$attendee])
|| $egw_event['participants'][$attendee] != $status)
{
$match = false;
break;
}
else
{
unset($egw_event['participants'][$attendee]);
}
}
if ($match && !empty($egw_event['participants'])) $match = false;
}
if ($match) return ($uidmatch['id'] . ':' . $event['recurrence']);
return false; // We need to create a new "status only" exception return false; // We need to create a new pseudo exception
}
} }
else else
{ {
@ -1177,19 +1204,7 @@ class calendar_boupdate extends calendar_bo
} }
unset($event['id']); unset($event['id']);
$query = array(
'cal_start='.$event['start'],
'cal_end='.$event['end'],
);
#foreach(array('title','location','priority','public','non_blocking','category') as $name) {
foreach (array('title','location','public','non_blocking','category') as $name)
{
if (!empty($event[$name])) $query['cal_'.$name] = $event[$name];
}
if($foundEvents = parent::search(array( if($foundEvents = parent::search(array(
//'user' => $this->user,
'query' => $query, 'query' => $query,
))) )))
{ {