extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 20:31:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong classification in get_event_info() and UID handling for CalDAV

Browse Source
This commit is contained in:
Jörg Lehrke 2010-02-11 20:50:35 +00:00
parent adf9a0917f
commit 65c06844e5
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1470,8 +1470,9 @@ class calendar_boupdate extends calendar_bo
'()[FOUND]:' . array2string($egwEvent)); '()[FOUND]:' . array2string($egwEvent));
} }
// Just a simple consistency check // Just a simple consistency check
if ($filter == 'master' && $egwEvent['recur_type'] != MCAL_RECUR_NONE || if ($filter == 'exact' ||
$filter == 'exact' || strpos($egwEvent['title'], $event['title']) === 0) $filter == 'master' && $egwEvent['recur_type'] != MCAL_RECUR_NONE ||
$filter != 'master' && strpos($egwEvent['title'], $event['title']) === 0)
{ {
$retval = $egwEvent['id']; $retval = $egwEvent['id'];
if ($egwEvent['recur_type'] != MCAL_RECUR_NONE && if ($egwEvent['recur_type'] != MCAL_RECUR_NONE &&
@ -1543,7 +1544,7 @@ class calendar_boupdate extends calendar_bo
} }
} }
} }
if ($filter != 'master') if ($filter != 'master' && $filter != 'exact' )
{ {
if (isset($event['whole_day']) && $event['whole_day']) if (isset($event['whole_day']) && $event['whole_day'])
{ {

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

@ -416,6 +416,10 @@ class calendar_groupdav extends groupdav_handler
return $event; return $event;
} }
$handler = $this->_get_handler(); $handler = $this->_get_handler();
if (!is_numeric($id) && ($foundEntries = $handler->find_event($options['content'], 'check')))
{
$id = array_shift($foundEntries);
}
if (!($cal_id = $handler->importVCal($options['content'],is_numeric($id) ? $id : -1, if (!($cal_id = $handler->importVCal($options['content'],is_numeric($id) ? $id : -1,
self::etag2value($this->http_if_match)))) self::etag2value($this->http_if_match))))
{ {