* create function to parse the output of goto into our folder structure

[citadel.git] / webcit / groupdav_options.c

diff --git a/webcit/groupdav_options.c b/webcit/groupdav_options.c
index 9f1fefcef7f48bddb153af6963c039f52d695aba..1b1f3b904c5ab7a25146e12c62d0dda16a90a31d 100644 (file)
--- a/webcit/groupdav_options.c
+++ b/webcit/groupdav_options.c
@@ -47,21 +47,21 @@ void groupdav_options(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("Date: %s\r\n", datestring);
                hprintf(
-                       "Content-Type: text/plain\r\n"
-                       "\r\n"
+                       "Content-Type: text/plain\r\n");
+               begin_burst();
+               wc_printf(
                        "There is no folder called \"%s\" on this server.\r\n",
                        ChrPtr(dav_roomname)
                );
-               begin_burst();
                end_burst();
                FreeStrBuf(&dav_roomname);
                FreeStrBuf(&dav_uid);
@@ -77,16 +77,16 @@ void groupdav_options(void)
                if (dav_msgnum < 0) {
                        hprintf("HTTP/1.1 404 not found\r\n");
                        groupdav_common_headers();
-                       hprintf(
-                               "Content-Type: text/plain\r\n"
-                               "\r\n"
+                       hprintf("Content-Type: text/plain\r\n");
+                       begin_burst();
+                       wc_printf(
                                "Object \"%s\" was not found in the \"%s\" folder.\r\n",
                                ChrPtr(dav_uid),
                                ChrPtr(dav_roomname)
                        );
                        FreeStrBuf(&dav_roomname);
                        FreeStrBuf(&dav_uid);
-                       begin_burst();end_burst();return;
+                       end_burst();return;
                }
 
                hprintf("HTTP/1.1 200 OK\r\n");
@@ -94,7 +94,7 @@ void groupdav_options(void)
                hprintf("Date: %s\r\n", datestring);
                hprintf("DAV: 1\r\n");
                hprintf("Allow: OPTIONS, PROPFIND, GET, PUT, DELETE\r\n");
-               hprintf("\r\n");
+               
                begin_burst();
                end_burst();
                FreeStrBuf(&dav_roomname);
@@ -114,7 +114,7 @@ void groupdav_options(void)
        hprintf("Date: %s\r\n", datestring);
        hprintf("DAV: 1\r\n");
        hprintf("Allow: OPTIONS, PROPFIND, GET, PUT\r\n");
-       hprintf("\r\n");
        begin_burst();
+       wc_printf("\r\n");
        end_burst();
 }