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

Improved ctag for CalDAV

Browse Source
This commit is contained in:
Jörg Lehrke 2010-09-12 12:44:22 +00:00
parent 5e161094e7
commit 6fde93d15b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -763,9 +763,7 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
'enum_recuring' => false, 'enum_recuring' => false,
'daywise' => false, 'daywise' => false,
'date_format' => 'server', 'date_format' => 'server',
'cols' => array('cal_modified'), 'cols' => array('egw_cal.cal_id', 'cal_start', 'cal_modified'),
'order' => 'cal_modified DESC',
'num_rows' => 1,
); );
if ($path == '/calendar/') if ($path == '/calendar/')
@ -777,18 +775,17 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
$filter['filter'] = 'default'; // not rejected $filter['filter'] = 'default'; // not rejected
} }
$ctag = 0;
if (($events =& $this->bo->search($filter))) if (($events =& $this->bo->search($filter)))
{ {
foreach ($events as $event) foreach ($events as $event)
{ {
$ctag = $event['cal_modified']; $modified = max($this->bo->so->max_user_modified($event['cal_id']), $event['cal_modified']);
if ($ctag < $modified) $ctag = $modified;
break; break;
} }
} }
else
{
$ctag = '0';
}
if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag"); if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");