fix viewing of bio

[citadel.git] / webcit / groupdav_put.c

diff --git a/webcit/groupdav_put.c b/webcit/groupdav_put.c
index 8d08a1e49d184e88999b554127c115adb94dac05..f0bd712e427f4269a6aca7618a613b07e8823b18 100644 (file)
--- a/webcit/groupdav_put.c
+++ b/webcit/groupdav_put.c
@@ -1,8 +1,21 @@
 /*
- * $Id$
- *
  * Handles GroupDAV PUT requests.
  *
+ * Copyright (c) 2005-2010 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.
+ *
+ * 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"
@@ -33,7 +46,8 @@ void groupdav_put_bigics(void)
                hprintf("HTTP/1.1 502 Bad Gateway\r\n");
                groupdav_common_headers();
                hprintf("Content-type: text/plain\r\n");
-               wprintf("%s\r\n", &buf[4]);
+               begin_burst();
+               wc_printf("%s\r\n", &buf[4]);
                end_burst();
                return;
        }
@@ -43,7 +57,7 @@ void groupdav_put_bigics(void)
 
        /* Report success and not much else. */
        hprintf("HTTP/1.1 204 No Content\r\n");
-       lprintf(9, "HTTP/1.1 204 No Content\r\n");
+       syslog(9, "HTTP/1.1 204 No Content\r\n");
        groupdav_common_headers();
        begin_burst();
        end_burst();
@@ -70,7 +84,8 @@ void groupdav_put(void)
                hprintf("HTTP/1.1 404 not found\r\n");
                groupdav_common_headers();
                hprintf("Content-Type: text/plain\r\n");
-               wprintf("The object you requested was not found.\r\n");
+               begin_burst();
+               wc_printf("The object you requested was not found.\r\n");
                end_burst();
                return;
        }
@@ -85,14 +100,15 @@ void groupdav_put(void)
        }
 
        /* Go to the correct room. */
-       if (strcasecmp(ChrPtr(WC->wc_roomname), ChrPtr(dav_roomname))) {
+       if (strcasecmp(ChrPtr(WC->CurRoom.name), ChrPtr(dav_roomname))) {
                gotoroom(dav_roomname);
        }
-       if (strcasecmp(ChrPtr(WC->wc_roomname), ChrPtr(dav_roomname))) {
+       if (strcasecmp(ChrPtr(WC->CurRoom.name), ChrPtr(dav_roomname))) {
                hprintf("HTTP/1.1 404 not found\r\n");
                groupdav_common_headers();
                hprintf("Content-Type: text/plain\r\n");
-               wprintf("There is no folder called \"%s\" on this server.\r\n",
+               begin_burst();
+               wc_printf("There is no folder called \"%s\" on this server.\r\n",
                        ChrPtr(dav_roomname));
                end_burst();
                FreeStrBuf(&dav_roomname);
@@ -108,15 +124,15 @@ void groupdav_put(void)
         * version, so we fail...
         */
        if (StrLength(WCC->Hdr->HR.dav_ifmatch) > 0) {
-               lprintf(9, "dav_ifmatch: %s\n", WCC->Hdr->HR.dav_ifmatch);
+               syslog(9, "dav_ifmatch: %s\n", ChrPtr(WCC->Hdr->HR.dav_ifmatch));
                old_msgnum = locate_message_by_uid(ChrPtr(dav_uid));
-               lprintf(9, "old_msgnum:  %ld\n", old_msgnum);
+               syslog(9, "old_msgnum:  %ld\n", old_msgnum);
                if (StrTol(WCC->Hdr->HR.dav_ifmatch) != old_msgnum) {
                        hprintf("HTTP/1.1 412 Precondition Failed\r\n");
-                       lprintf(9, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n",
+                       syslog(9, "HTTP/1.1 412 Precondition Failed (ifmatch=%ld, old_msgnum=%ld)\r\n",
                                StrTol(WCC->Hdr->HR.dav_ifmatch), old_msgnum);
                        groupdav_common_headers();
-                       hprintf("Content-Length: 0\r\n");
+                       
                        end_burst();
                        FreeStrBuf(&dav_roomname);
                        FreeStrBuf(&dav_uid);
@@ -144,8 +160,8 @@ void groupdav_put(void)
                hprintf("HTTP/1.1 502 Bad Gateway\r\n");
                groupdav_common_headers();
                hprintf("Content-type: text/plain\r\n");
-
-               wprintf("%s\r\n", &buf[4]);
+               begin_burst();
+               wc_printf("%s\r\n", &buf[4]);
                end_burst();
                return;
        }
@@ -164,7 +180,7 @@ void groupdav_put(void)
                        new_msgnum = atol(buf);
                        break;
                case 1: 
-                       lprintf(9, "new_msgnum=%ld (%s)\n", new_msgnum, buf);
+                       syslog(9, "new_msgnum=%ld (%s)\n", new_msgnum, buf);
                        break;
                case 2: 
                        StrBufAppendBufPlain(dav_uid, buf, -1, 0);
@@ -181,7 +197,8 @@ void groupdav_put(void)
                hprintf("HTTP/1.1 502 Bad Gateway\r\n");
                groupdav_common_headers();
                hprintf("Content-type: text/plain\r\n");
-               wprintf("new_msgnum is %ld\r\n"
+               begin_burst();
+               wc_printf("new_msgnum is %ld\r\n"
                        "\r\n", new_msgnum);
                end_burst();
                FreeStrBuf(&dav_roomname);
@@ -193,7 +210,7 @@ void groupdav_put(void)
        if (old_msgnum < 0L) {
                char escaped_uid[1024];
                hprintf("HTTP/1.1 201 Created\r\n");
-               lprintf(9, "HTTP/1.1 201 Created\r\n");
+               syslog(9, "HTTP/1.1 201 Created\r\n");
                groupdav_common_headers();
                hprintf("etag: \"%ld\"\r\n", new_msgnum);
                hprintf("Location: ");
@@ -210,7 +227,7 @@ void groupdav_put(void)
 
        /* We modified an existing item. */
        hprintf("HTTP/1.1 204 No Content\r\n");
-       lprintf(9, "HTTP/1.1 204 No Content\r\n");
+       syslog(9, "HTTP/1.1 204 No Content\r\n");
        groupdav_common_headers();
        hprintf("Etag: \"%ld\"\r\n", new_msgnum);
        /* The item we replaced has probably already been deleted by