diff --git a/inc/caldav-DELETE.php b/inc/caldav-DELETE.php index 6367f2b9..24fc90b1 100644 --- a/inc/caldav-DELETE.php +++ b/inc/caldav-DELETE.php @@ -58,7 +58,7 @@ if ( $request->IsCollection() ) { } } else { - $request->DoResponse( 404, ""); + $request->DoResponse( 404 ); } } else { @@ -69,7 +69,7 @@ else { if ( $qry->Exec("DELETE") && $qry->rows == 1 ) { $delete_row = $qry->Fetch(); if ( (isset($request->etag_if_match) && $request->etag_if_match != $delete_row->dav_etag) ) { - $request->DoResponse( 412, translate("Resource does not match 'If-Match' header - not deleted") ); + $request->DoResponse( 412, translate("Resource has changed on server - not deleted") ); } $qry = new PgQuery( "DELETE FROM caldav_data WHERE user_no = ? AND dav_name = ?;", $request->user_no, $request->path ); if ( $qry->Exec("DELETE") ) { @@ -81,7 +81,7 @@ else { } } else { - $request->DoResponse( 404, ""); + $request->DoResponse( 404 ); } } diff --git a/inc/caldav-PUT.php b/inc/caldav-PUT.php index 1b14c5ac..2238d4c9 100644 --- a/inc/caldav-PUT.php +++ b/inc/caldav-PUT.php @@ -77,7 +77,7 @@ elseif ( $qry->rows < 1 ) { * entity exists, the server MUST NOT perform the requested method, and * MUST return a 412 (Precondition Failed) response. */ - $request->DoResponse( 412, translate("No existing resource matching 'If-Match' header - not accepted.") ); + $request->DoResponse( 412, translate("Resource changed on server - not changed.") ); } $put_action_type = 'INSERT';