sneaking up on that bug like a cat prowling in the jungle

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 90a3db6a3ff7ba2aafa7ba06de8984758cb47b3b..6d789dc4879b990725c30b5df3882f15eb085733 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "webcit.h"
-#include "groupdav.h"
+#include "dav.h"
 #include "webserver.h"
 
 StrBuf *csslocal = NULL;
@@ -260,7 +260,7 @@ void http_redirect(const char *whichpage) {
 void http_transmit_thing(const char *content_type, int is_static)
 {
 
-       syslog(9, "http_transmit_thing(%s)%s\n", content_type, ((is_static > 0) ? " (static)" : ""));
+       syslog(9, "http_transmit_thing(%s)%s", content_type, ((is_static > 0) ? " (static)" : ""));
        output_headers(0, 0, 0, 0, 0, is_static);
 
        hprintf("Content-type: %s\r\n"
@@ -347,13 +347,16 @@ void authorization_required(void)
        wc_printf("<h1>");
        wc_printf(_("Authorization Required"));
        wc_printf("</h1>\r\n");
-       
 
-       if (WCC->ImportantMsg != NULL)
+       if (WCC->ImportantMsg != NULL) {
                message = ChrPtr(WCC->ImportantMsg);
+       }
 
-       wc_printf(_("The resource you requested requires a valid username and password. "
-               "You could not be logged in: %s\n"), message);
+       wc_printf(
+               _("The resource you requested requires a valid username and password. "
+               "You could not be logged in: %s\n"),
+               message
+       );
        wDumpContent(0);
        end_webcit_session();
 }
@@ -395,7 +398,7 @@ void ajax_servcmd(void)
        char *junk;
        size_t len;
 
-       syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"\n", bstr("g_cmd") );
+       syslog(LOG_DEBUG, "ajax_servcmd() g_cmd=\"%s\"", bstr("g_cmd") );
        begin_ajax_response();
        Buf = NewStrBuf();
        serv_puts(bstr("g_cmd"));
@@ -492,7 +495,7 @@ void push_destination(void) {
 
        FreeStrBuf(&WCC->PushedDestination);
        WCC->PushedDestination = NewStrBufDup(SBSTR("url"));
-       syslog(9, "Push: %s\n", ChrPtr(WCC->PushedDestination));
+       syslog(9, "Push: %s", ChrPtr(WCC->PushedDestination));
        wc_printf("OK");
 }
 
@@ -529,7 +532,7 @@ void pop_destination(void) {
        /*
         * All righty then!  We have a destination saved, so go there now.
         */
-       syslog(9, "Pop: %s\n", ChrPtr(WCC->PushedDestination));
+       syslog(9, "Pop: %s", ChrPtr(WCC->PushedDestination));
        http_redirect(ChrPtr(WCC->PushedDestination));
 }
 
@@ -584,7 +587,7 @@ int ReadPostData(void)
        return 1;
 }
 
-
+#if 0
 void ParseREST_URL(void)
 {
        StrBuf *Buf;
@@ -595,7 +598,7 @@ void ParseREST_URL(void)
        HashList *Floors;
        void *vFloor;
 
-       syslog(1, "parsing rest URL: %s\n", ChrPtr(WCC->Hdr->HR.ReqLine));
+       syslog(1, "parsing rest URL: %s", ChrPtr(WCC->Hdr->HR.ReqLine));
 
        WCC->Directory = NewHash(1, Flathash);
        WCC->CurrentFloor = NULL;
@@ -626,6 +629,7 @@ void ParseREST_URL(void)
                }
        }
 }
+#endif
 
 int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP)
 {
@@ -691,11 +695,11 @@ void session_loop(void)
 
        /* If the client sent a nonce that is incorrect, kill the request. */
        if (havebstr("nonce")) {
-               syslog(9, "Comparing supplied nonce %s to session nonce %d\n", 
+               syslog(9, "Comparing supplied nonce %s to session nonce %d", 
                        bstr("nonce"), WCC->nonce
                );
                if (ibstr("nonce") != WCC->nonce) {
-                       syslog(9, "Ignoring request with mismatched nonce.\n");
+                       syslog(9, "Ignoring request with mismatched nonce.");
                        hprintf("HTTP/1.1 404 Security check failed\r\n");
                        hprintf("Content-Type: text/plain\r\n");
                        begin_burst();
@@ -771,18 +775,18 @@ void session_loop(void)
         */
        if (havebstr("go")) {
                int ret;
-               syslog(9, "Explicit room selection: %s\n", bstr("go"));
+               syslog(9, "Explicit room selection: %s", bstr("go"));
                ret = gotoroom(sbstr("go"));    /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
-                       syslog(1, "Unable to change to [%s]; Reason: %d\n", bstr("go"), ret);
+                       syslog(1, "Unable to change to [%s]; Reason: %d", bstr("go"), ret);
                }
        }
        else if (havebstr("gotofirst")) {
                int ret;
-               syslog(9, "Explicit room selection: %s\n", bstr("gotofirst"));
+               syslog(9, "Explicit room selection: %s", bstr("gotofirst"));
                ret = gotoroom(sbstr("gotofirst"));     /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
-                       syslog(1, "Unable to change to [%s]; Reason: %d\n", bstr("gotofirst"), ret);
+                       syslog(1, "Unable to change to [%s]; Reason: %d", bstr("gotofirst"), ret);
                }
        }
 
@@ -793,13 +797,13 @@ void session_loop(void)
        else if ( (StrLength(WCC->CurRoom.name) == 0) && ( (StrLength(WCC->Hdr->c_roomname) > 0) )) {
                int ret;
 
-               syslog(9, "We are in '%s' but cookie indicates '%s', going there...\n",
+               syslog(9, "We are in '%s' but cookie indicates '%s', going there...",
                        ChrPtr(WCC->CurRoom.name),
                        ChrPtr(WCC->Hdr->c_roomname)
                );
                ret = gotoroom(WCC->Hdr->c_roomname);   /* do quietly to avoid session output! */
                if ((ret/100) != 2) {
-                       syslog(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d\n",
+                       syslog(1, "COOKIEGOTO: Unable to change to [%s]; Reason: %d",
                                ChrPtr(WCC->Hdr->c_roomname), ret);
                }
        }
@@ -812,10 +816,10 @@ void session_loop(void)
                        display_login();
                }
                else {
-/*
+#if 0
                        if ((WCC->Hdr->HR.Handler->Flags & PARSE_REST_URL) != 0)
                                ParseREST_URL();
-*/
+#endif
                        if ((WCC->Hdr->HR.Handler->Flags & AJAX) != 0)
                                begin_ajax_response();
                        WCC->Hdr->HR.Handler->F();
@@ -842,7 +846,7 @@ void session_loop(void)
                 */
                else {
                        if (xhttp)
-                               groupdav_main();
+                               dav_main();
                        else
                                display_main_menu();
                }
@@ -978,11 +982,11 @@ InitModule_WEBCIT
        
        snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);
        if (!access(dir, R_OK)) {
-               syslog(9, "Using local Stylesheet [%s]\n", dir);
+               syslog(9, "Using local Stylesheet [%s]", dir);
                csslocal = NewStrBufPlain(HKEY("<link href=\"static.local/webcit.css\" rel=\"stylesheet\" type=\"text/css\" />"));
        }
        else
-               syslog(9, "No Site-local Stylesheet [%s] installed. \n", dir);
+               syslog(9, "No Site-local Stylesheet [%s] installed.", dir);
 
 }