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

Fix GroupDAV iterator issue

Browse Source
This commit is contained in:
Jörg Lehrke 2010-03-16 20:46:56 +00:00
parent 4415bb1112
commit 8f0e299012
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@ class calendar_groupdav extends groupdav_handler
if ($events) if ($events)
{ {
// get all max user modified times at once // get all max user modified times at once
foreach($events as $k => &$event) foreach($events as $k => $event)
{ {
if ($this->client_shared_uid_exceptions && if ($this->client_shared_uid_exceptions &&
$event['reference'] && $event['reference'] &&
@ -185,7 +185,7 @@ class calendar_groupdav extends groupdav_handler
} }
$max_user_modified = $this->bo->so->max_user_modified($ids); $max_user_modified = $this->bo->so->max_user_modified($ids);
foreach($events as &$event) foreach($events as $event)
{ {
$event['max_user_modified'] = $max_user_modified[$event['id']]; $event['max_user_modified'] = $max_user_modified[$event['id']];
//header('X-EGROUPWARE-EVENT-'.$event['id'].': '.$event['title'].': '.date('Y-m-d H:i:s',$event['start']).' - '.date('Y-m-d H:i:s',$event['end'])); //header('X-EGROUPWARE-EVENT-'.$event['id'].': '.$event['title'].': '.date('Y-m-d H:i:s',$event['start']).' - '.date('Y-m-d H:i:s',$event['end']));

9
infolog/inc/class.infolog_groupdav.inc.php
View File

@ -102,9 +102,8 @@ class infolog_groupdav extends groupdav_handler
// todo add a filter to limit how far back entries from the past get synced // todo add a filter to limit how far back entries from the past get synced
$filter = array( $filter = array(
'info_type' => 'task', 'info_type' => 'task',
'filter' => $task_filter, 'filter' => $task_filter,
'calendar_data' => false,
); );
// process REPORT filters or multiget href's // process REPORT filters or multiget href's
@ -165,7 +164,7 @@ class infolog_groupdav extends groupdav_handler
'col_filter' => $filter, 'col_filter' => $filter,
); );
if ($calendar_data) if (!$calendar_data)
{ {
$query['cols'] = array('info_id', 'info_datemodified'); $query['cols'] = array('info_id', 'info_datemodified');
} }
@ -185,7 +184,7 @@ class infolog_groupdav extends groupdav_handler
$tasks =& $this->bo->search($query); $tasks =& $this->bo->search($query);
if ($tasks && $offset == $query['start']) if ($tasks && $offset == $query['start'])
{ {
foreach($tasks as &$task) foreach($tasks as $task)
{ {
$props = array( $props = array(
HTTP_WebDAV_Server::mkprop('getetag',$this->get_etag($task)), HTTP_WebDAV_Server::mkprop('getetag',$this->get_etag($task)),