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

Fix more find_event issues

Browse Source
This commit is contained in:
Jörg Lehrke 2010-09-12 20:34:09 +00:00
parent 8b71dc8183
commit e5eb12eb31
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1583,7 +1583,7 @@ class calendar_boupdate extends calendar_bo
$query[] = 'recur_type!='. MCAL_RECUR_NONE;
$query['cal_recurrence'] = 0;
}
else
elseif ($filter == 'exact')
{
if ($event['recur_type'] != MCAL_RECUR_NONE)
{
@ -1963,8 +1963,15 @@ class calendar_boupdate extends calendar_bo
unset($egwEvent['participants'][$attendee]);
}
}
// ORGANIZER is maybe missing
// ORGANIZER and Groups may be missing
unset($egwEvent['participants'][$egwEvent['owner']]);
foreach ($egwEvent['participants'] as $attendee => $status)
{
if (is_numeric($attendee) && $attendee < 0)
{
unset($egwEvent['participants'][$attendee]);
}
}
if (!empty($egwEvent['participants']))
{
if ($this->log)
@ -2016,7 +2023,7 @@ class calendar_boupdate extends calendar_bo
{
error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
'() missing event[recur_exception]: ' .
array2string($event['recur_exception']));
array2string($event['recur_exception'])."\n",3,$this->logfile);
}
continue;
}
@ -2040,12 +2047,10 @@ class calendar_boupdate extends calendar_bo
}
$matchingEvents[] = $egwEvent['id']; // exact match
}
if (!empty($event['uid']) &&
count($matchingEvents) > 1 || $filter != 'master' &&
$egwEvent['recur_type'] != MCAL_RECUR_NONE &&
empty($event['recur_type']))
if ($filter == 'exact' && !empty($event['uid']) && count($matchingEvents) > 1
|| $filter != 'master' && !empty($egwEvent['recur_type']) && empty($event['recur_type']))
{
// Unknown exception for existing series
if ($this->log)
{