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

remove unusual and unnecessary "EGw-...-wGE" prefix/postfix from etag and ctag

Browse Source
This commit is contained in:
Ralf Becker 2011-10-08 11:34:55 +00:00
parent 5e3362b3b7
commit b2fa12eb3e
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_groupdav.inc.php
View File

@ -521,9 +521,7 @@ class addressbook_groupdav extends groupdav_handler
// not showing addressbook of a single user? // not showing addressbook of a single user?
if (!$user || $path == '/addressbook/') $user = null; if (!$user || $path == '/addressbook/') $user = null;
$ctag = $this->bo->get_ctag($user); return $this->bo->get_ctag($user);
return 'EGw-'.$ctag.'-wGE';
} }
/** /**

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

@ -982,7 +982,7 @@ class calendar_groupdav extends groupdav_handler
if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag"); if ($this->debug > 1) error_log(__FILE__.'['.__LINE__.'] '.__METHOD__. "($path)[$user] = $ctag");
return 'EGw-'.$ctag.'-wGE'; return $ctag;
} }
/** /**
@ -996,7 +996,7 @@ class calendar_groupdav extends groupdav_handler
$etag = $this->bo->get_etag($entry,$this->client_shared_uid_exceptions); $etag = $this->bo->get_etag($entry,$this->client_shared_uid_exceptions);
//error_log(__METHOD__ . "($entry[id] ($entry[etag]): $entry[title] --> etag=$etag"); //error_log(__METHOD__ . "($entry[id] ($entry[etag]): $entry[title] --> etag=$etag");
return 'EGw-'.$etag.'-wGE'; return $etag;
} }
/** /**

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

@ -575,7 +575,7 @@ class infolog_groupdav extends groupdav_handler
{ {
return false; return false;
} }
return 'EGw-'.$info['info_id'].':'.$info['info_datemodified'].'-wGE'; return $info['info_id'].':'.$info['info_datemodified'];
} }
/** /**

4
phpgwapi/inc/class.groupdav.inc.php
View File

@ -419,7 +419,7 @@ class groupdav extends HTTP_WebDAV_Server
// required props per WebDAV standard // required props per WebDAV standard
foreach(array( foreach(array(
'displayname' => basename($path), 'displayname' => basename($path),
'getetag' => 'EGw-no-etag-wGE', 'getetag' => 'none',
'getcontentlength' => '', 'getcontentlength' => '',
'getlastmodified' => '', 'getlastmodified' => '',
'getcontenttype' => '', 'getcontenttype' => '',
@ -716,8 +716,6 @@ class groupdav extends HTTP_WebDAV_Server
groupdav::CALENDARSERVER,'getctag',$handler->getctag($path,$user)); groupdav::CALENDARSERVER,'getctag',$handler->getctag($path,$user));
} }
} }
$props['getetag'] = 'EGw-'.$app.'-wGE';
if ($handler) $privileges = $handler->current_user_privileges($path.$app.'/', $user) ; if ($handler) $privileges = $handler->current_user_privileges($path.$app.'/', $user) ;
return $this->add_collection($path.$app.'/', $props, $privileges); return $this->add_collection($path.$app.'/', $props, $privileges);

2
phpgwapi/inc/class.groupdav_handler.inc.php
View File

@ -217,7 +217,7 @@ abstract class groupdav_handler
// error_log(__METHOD__."(".array2string($entry).") Cant create etag!"); // error_log(__METHOD__."(".array2string($entry).") Cant create etag!");
return false; return false;
} }
return 'EGw-'.$entry['id'].':'.(isset($entry['etag']) ? $entry['etag'] : $entry['modified']).'-wGE'; return $entry['id'].':'.(isset($entry['etag']) ? $entry['etag'] : $entry['modified']);
} }
/** /**

6
phpgwapi/inc/class.groupdav_principals.inc.php
View File

@ -893,7 +893,7 @@ class groupdav_principals extends groupdav_handler
return $this->add_principal($principal.'/'.$type, array( return $this->add_principal($principal.'/'.$type, array(
'displayname' => $app.' '.$what.' proxy of '.basename($principal), 'displayname' => $app.' '.$what.' proxy of '.basename($principal),
'group-member-set' => $this->principal_set('group-member-set', $proxys), 'group-member-set' => $this->principal_set('group-member-set', $proxys),
'getetag' => 'EGw-'.md5(serialize($proxys)).'-wGE', 'getetag' => md5(serialize($proxys)),
'resourcetype' => array(HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, $type, '')), 'resourcetype' => array(HTTP_WebDAV_Server::mkprop(groupdav::CALENDARSERVER, $type, '')),
)); ));
} }
@ -1040,12 +1040,12 @@ class groupdav_principals extends groupdav_handler
{ {
$account = $this->read($account); $account = $this->read($account);
} }
return 'EGw-'.$account['account_id'].':'.md5(serialize($account)). return $account['account_id'].':'.md5(serialize($account)).
// add md5 from calendar grants, as they are listed as memberships // add md5 from calendar grants, as they are listed as memberships
':'.md5(serialize($this->acl->get_grants('calendar', true, $account['account_id']))). ':'.md5(serialize($this->acl->get_grants('calendar', true, $account['account_id']))).
// as the principal of current user is influenced by GroupDAV prefs, we have to include them in the etag // as the principal of current user is influenced by GroupDAV prefs, we have to include them in the etag
($account['account_id'] == $GLOBALS['egw_info']['user']['account_id'] ? ($account['account_id'] == $GLOBALS['egw_info']['user']['account_id'] ?
':'.md5(serialize($GLOBALS['egw_info']['user']['preferences']['groupdav'])) : '').'-wGE'; ':'.md5(serialize($GLOBALS['egw_info']['user']['preferences']['groupdav'])) : '');
} }
/** /**