nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-30 03:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove dependence on PgQuery.

Browse Source
This commit is contained in:
Andrew McMillan 2010-03-17 20:19:35 +13:00
parent 3a56dad25c
commit 12b8f097d7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
inc/caldav-DELETE.php
View File

@ -64,9 +64,9 @@ else {
/** /**
* We read the resource first, so we can check if it matches (or does not match) * We read the resource first, so we can check if it matches (or does not match)
*/ */
$escaped_path = qpg($request->path); $params = array( ':dav_name' => $request->path );
$qry = new AwlQuery( "SELECT cd.dav_etag, ci.uid, cd.collection_id FROM caldav_data cd JOIN calendar_item ci USING (dav_id) WHERE cd.dav_name = $escaped_path" ); $qry = new AwlQuery( 'SELECT cd.dav_etag, ci.uid, cd.collection_id FROM caldav_data cd JOIN calendar_item ci USING (dav_id) WHERE cd.dav_name = :dav_name', $params );
if ( $qry->Exec("DELETE") && $qry->rows() == 1 ) { if ( $qry->Exec('DELETE',__LINE__,__FILE__) && $qry->rows() == 1 ) {
$delete_row = $qry->Fetch(); $delete_row = $qry->Fetch();
if ( (isset($request->etag_if_match) && $request->etag_if_match != $delete_row->dav_etag) ) { if ( (isset($request->etag_if_match) && $request->etag_if_match != $delete_row->dav_etag) ) {
$request->DoResponse( 412, translate("Resource has changed on server - not deleted") ); $request->DoResponse( 412, translate("Resource has changed on server - not deleted") );
@ -75,9 +75,9 @@ else {
$collection_id = $delete_row->collection_id; $collection_id = $delete_row->collection_id;
if ( $qry->Begin() if ( $qry->Begin()
&& $qry->QDo("DELETE FROM caldav_data WHERE collection_id = $collection_id AND dav_name = $escaped_path" ) && $qry->QDo("DELETE FROM caldav_data WHERE collection_id = $collection_id AND dav_name = :dav_name", $params )
&& $qry->QDo("SELECT write_sync_change( $collection_id, 404, $escaped_path)" ) && $qry->QDo("SELECT write_sync_change( $collection_id, 404, :dav_name)", $params )
&& $qry->QDo("DELETE FROM property WHERE dav_name = $escaped_path" ) && $qry->QDo("DELETE FROM property WHERE dav_name = :dav_name", $params )
&& $qry->Commit() ) { && $qry->Commit() ) {
@dbg_error_log( "DELETE", "DELETE: User: %d, ETag: %s, Path: %s", $session->user_no, $request->etag_if_match, $request->path); @dbg_error_log( "DELETE", "DELETE: User: %d, ETag: %s, Path: %s", $session->user_no, $request->etag_if_match, $request->path);
if ( function_exists('log_caldav_action') ) { if ( function_exists('log_caldav_action') ) {