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

Fix etag/ctag issues for CalDAV

Browse Source
This commit is contained in:
Jörg Lehrke 2010-05-19 15:25:07 +00:00
parent ffc36027ba
commit 03885572b6
1 changed files with 9 additions and 4 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

@ -424,6 +424,7 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
$events =& $bo->search(array( $events =& $bo->search(array(
'query' => array('cal_uid' => $uid), 'query' => array('cal_uid' => $uid),
'filter' => 'owner', // return all possible entries
'daywise' => false, 'daywise' => false,
'date_format' => 'server', 'date_format' => 'server',
)); ));
@ -699,6 +700,8 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
*/ */
public function getctag($path,$user) public function getctag($path,$user)
{ {
if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user]");
$filter = array( $filter = array(
'users' => $user, 'users' => $user,
'start' => time()-100*24*3600, // default one month back -30 breaks all sync recurrences 'start' => time()-100*24*3600, // default one month back -30 breaks all sync recurrences
@ -706,12 +709,12 @@ 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',
'order' => 'cal_modified DESC', 'order' => 'cal_modified DESC,cal_etag DESC',
'offset' => 0, 'offset' => 0,
'num_rows' => 1, 'num_rows' => 1,
); );
if ($path == '/calendar/') if (strpos($path, '/calendar') === 0)
{ {
$filter['filter'] = 'owner'; $filter['filter'] = 'owner';
} }
@ -745,18 +748,20 @@ error_log(__METHOD__."($path,,".array2string($start).") filter=".array2string($f
// use new MAX(modification date) of egw_cal_user table (deals with virtual exceptions too) // use new MAX(modification date) of egw_cal_user table (deals with virtual exceptions too)
if (isset($entry['max_user_modified'])) if (isset($entry['max_user_modified']))
{ {
$etag .= ':'.$entry['max_user_modified']; $modified = max($entry['max_user_modified'], $entry['modified']);
} }
else else
{ {
$etag .= ':'.$this->bo->so->max_user_modified($entry['id']); $modified = max($this->bo->so->max_user_modified($entry['id']), $entry['modified']);
} }
$etag .= ':' . $modified;
// include exception etags into our own etag, if exceptions are included // include exception etags into our own etag, if exceptions are included
if ($this->client_shared_uid_exceptions && !empty($entry['uid']) && if ($this->client_shared_uid_exceptions && !empty($entry['uid']) &&
$entry['recur_type'] != MCAL_RECUR_NONE && $entry['recur_exception']) $entry['recur_type'] != MCAL_RECUR_NONE && $entry['recur_exception'])
{ {
$events =& $this->bo->search(array( $events =& $this->bo->search(array(
'query' => array('cal_uid' => $entry['uid']), 'query' => array('cal_uid' => $entry['uid']),
'filter' => 'owner', // return all possible entries
'daywise' => false, 'daywise' => false,
'enum_recuring' => false, 'enum_recuring' => false,
'date_format' => 'server', 'date_format' => 'server',