X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdav_delete.c;h=6abd8ce8e787b5f26c887624832b62e9dc88fb84;hb=HEAD;hp=7966f9c12009be4dc37276cabdd06bab940f88ff;hpb=977a00909d0de9ab3f96e6f5bdac18d91e30d79f;p=citadel.git

diff --git a/webcit/dav_delete.c b/webcit/dav_delete.c
index 7966f9c12..85ae54e08 100644
--- a/webcit/dav_delete.c
+++ b/webcit/dav_delete.c
@@ -1,32 +1,26 @@
 /*
  * Handles GroupDAV DELETE requests.
  *
- * Copyright (c) 2005-2010 by the citadel.org team
+ * Copyright (c) 2005-2012 by the citadel.org team
  *
  * This program is open source software.  You can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
+ * modify it under the terms of the GNU General Public License, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 
 
 /*
  * The pathname is always going to be /groupdav/room_name/euid
  */
-void groupdav_delete(void) 
+void dav_delete(void) 
 {
 	wcsession *WCC = WC;
 	char dav_uid[SIZ];
@@ -53,7 +47,7 @@ void groupdav_delete(void)
 	}
 	if (strcasecmp(ChrPtr(WC->CurRoom.name), ChrPtr(dav_roomname))) {
 		hprintf("HTTP/1.1 404 not found\r\n");
-		groupdav_common_headers();
+		dav_common_headers();
 		hprintf("Content-Length: 0\r\n\r\n");
 		begin_burst();
 		end_burst();
@@ -68,7 +62,7 @@ void groupdav_delete(void)
 	 */
 	if (dav_msgnum < 0L) {
 		hprintf("HTTP/1.1 404 Not Found\r\n");
-		groupdav_common_headers();
+		dav_common_headers();
 		hprintf("Content-Length: 0\r\n\r\n");
 		begin_burst();
 		end_burst();
@@ -83,7 +77,7 @@ void groupdav_delete(void)
 	if (StrLength(WCC->Hdr->HR.dav_ifmatch) > 0) {
 		if (StrTol(WCC->Hdr->HR.dav_ifmatch) != dav_msgnum) {
 			hprintf("HTTP/1.1 412 Precondition Failed\r\n");
-			groupdav_common_headers();
+			dav_common_headers();
 			hprintf("Content-Length: 0\r\n\r\n");
 			begin_burst();
 			end_burst();
@@ -99,14 +93,14 @@ void groupdav_delete(void)
 	serv_getln(buf, sizeof buf);
 	if (buf[0] == '2') {
 		hprintf("HTTP/1.1 204 No Content\r\n");	/* success */
-		groupdav_common_headers();
+		dav_common_headers();
 		hprintf("Content-Length: 0\r\n\r\n");
 		begin_burst();
 		end_burst();
 	}
 	else {
 		hprintf("HTTP/1.1 403 Forbidden\r\n");	/* access denied */
-		groupdav_common_headers();
+		dav_common_headers();
 		hprintf("Content-Length: 0\r\n\r\n");
 		begin_burst();
 		end_burst();