nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-01 16:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few more places we need to ensure the collection is uncached.

Browse Source 
Signed-off-by: Andrew McMillan <andrew@morphoss.com>
This commit is contained in:
Andrew McMillan 2011-01-01 21:55:55 +13:00
parent 90c35ec385
commit f305cdf4cb
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/caldav-PUT-default.php
View File

@ -91,6 +91,10 @@ $qry->QDo("SELECT write_sync_change( $collection_id, $response_code, :dav_name)"
$qry = new AwlQuery('COMMIT'); $qry = new AwlQuery('COMMIT');
if ( !$qry->Exec('move') ) rollback(500); if ( !$qry->Exec('move') ) rollback(500);
// Uncache anything to do with the collection
$cache = getCacheInstance();
$cache->delete( 'collection-'.$container->dav_name(), null );
header('ETag: "'. $etag . '"' ); header('ETag: "'. $etag . '"' );
if ( $response_code == 200 ) $response_code = 204; if ( $response_code == 200 ) $response_code = 204;
$request->DoResponse( $response_code ); $request->DoResponse( $response_code );

4
inc/caldav-PUT-vcard.php
View File

@ -96,6 +96,10 @@ if ( !$qry->Commit() ) {
$request->DoResponse( 500, "A database error occurred" ); $request->DoResponse( 500, "A database error occurred" );
} }
// Uncache anything to do with the collection
$cache = getCacheInstance();
$cache->delete( 'collection-'.$container->dav_name(), null );
header('ETag: "'. $etag . '"' ); header('ETag: "'. $etag . '"' );
if ( $response_code == 200 ) $response_code = 204; if ( $response_code == 200 ) $response_code = 204;
$request->DoResponse( $response_code ); $request->DoResponse( $response_code );

3
inc/ui/collection-edit.php
View File

@ -117,6 +117,9 @@ if ( $can_write_collection && $editor->IsSubmit() ) {
$c->messages[] = i18n('The file is not UTF-8 encoded, please check the error for more details.'); $c->messages[] = i18n('The file is not UTF-8 encoded, please check the error for more details.');
} }
} }
// Uncache anything to do with the collection
$cache = getCacheInstance();
$cache->delete( 'collection-'.$editor->Value('dav_name'), null );
} }
else { else {
if ( $id > 0 ) $editor->GetRecord(); if ( $id > 0 ) $editor->GetRecord();

4
testing/tests/carddav/2010-PROPFIND.result
View File

@ -2,7 +2,7 @@ HTTP/1.1 207 Multi-Status
Date: Dow, 01 Jan 2000 00:00:00 GMT Date: Dow, 01 Jan 2000 00:00:00 GMT
DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
DAV: extended-mkcol, calendar-proxy, bind, addressbook DAV: extended-mkcol, calendar-proxy, bind, addressbook
ETag: "0f450e6f8b3be4245401f6cc1982fd0b" ETag: "e722f053aaa9eef890641a0ba88837e5"
Content-Length: 339 Content-Length: 339
Content-Type: text/xml; charset="utf-8" Content-Type: text/xml; charset="utf-8"
@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
<href>/caldav.php/user1/addressbook/</href> <href>/caldav.php/user1/addressbook/</href>
<propstat> <propstat>
<prop> <prop>
<C:getctag>"ed3adbac9a1901c4d9775d7b553d1aef"</C:getctag> <C:getctag>"80a8bc51f0e0b0fdd2037f1e12f5ad47"</C:getctag>
</prop> </prop>
<status>HTTP/1.1 200 OK</status> <status>HTTP/1.1 200 OK</status>
</propstat> </propstat>