Removed trailing newlines from syslog format screens, since they are not needed.

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 6d9373edb6708071982e4536792b5757bdbf4838..aa8c4cfbd7cbac1b2ed3836374bdb99f5bbeb848 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;
@@ -202,20 +202,7 @@ void output_headers(       int do_httpheaders,     /* 1 = output HTTP headers                        */
                do_template("head");
 
                /* check for ImportantMessages (these display in a div overlaying the main screen) */
-               if (!IsEmptyStr(WCC->ImportantMessage)) {
-                       wc_printf("<div id=\"important_message\">\n"
-                               "<span class=\"imsg\">");
-                       StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
-                       wc_printf("</span><br>\n"
-                               "</div>\n"
-                       );
-                       StrBufAppendBufPlain(WCC->trailing_javascript,
-                                            HKEY("setTimeout('hide_imsg_popup()', 5000);       \n"), 
-                                            0
-                       );
-                       WCC->ImportantMessage[0] = 0;
-               }
-               else if (StrLength(WCC->ImportantMsg) > 0) {
+               if (StrLength(WCC->ImportantMsg) > 0) {
                        wc_printf("<div id=\"important_message\">\n"
                                "<span class=\"imsg\">");
                        StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
@@ -273,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"
@@ -334,7 +321,7 @@ void url_do_template(void) {
 /*
  * convenience function to indicate success
  */
-void display_success(char *successmessage)
+void display_success(const char *successmessage)
 {
        convenience_page("007700", "OK", successmessage);
 }
@@ -364,8 +351,6 @@ void authorization_required(void)
 
        if (WCC->ImportantMsg != NULL)
                message = ChrPtr(WCC->ImportantMsg);
-       else if (WCC->ImportantMessage != NULL)
-               message = WCC->ImportantMessage;
 
        wc_printf(_("The resource you requested requires a valid username and password. "
                "You could not be logged in: %s\n"), message);
@@ -410,7 +395,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"));
@@ -507,7 +492,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");
 }
 
@@ -544,7 +529,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));
 }
 
@@ -610,7 +595,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;
@@ -669,7 +654,6 @@ int Conditional_REST_DEPTH(StrBuf *Target, WCTemplputParams *TP)
  */
 void session_loop(void)
 {
-       int Flags = 0;
        int xhttp;
        StrBuf *Buf;
        
@@ -683,8 +667,6 @@ void session_loop(void)
        WCC->upload_length = 0;
        WCC->upload = NULL;
        WCC->Hdr->nWildfireHeaders = 0;
-       if (WCC->Hdr->HR.Handler != NULL)
-               Flags = WCC->Hdr->HR.Handler->Flags; /* so we can temporarily add our own... */
 
        if (WCC->Hdr->HR.ContentLength > 0) {
                if (ReadPostData() < 0) {
@@ -709,11 +691,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();
@@ -789,18 +771,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);
                }
        }
 
@@ -811,13 +793,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);
                }
        }
@@ -860,7 +842,7 @@ void session_loop(void)
                 */
                else {
                        if (xhttp)
-                               groupdav_main();
+                               dav_main();
                        else
                                display_main_menu();
                }
@@ -929,8 +911,7 @@ int ConditionalImportantMesage(StrBuf *Target, WCTemplputParams *TP)
 {
        wcsession *WCC = WC;
        if (WCC != NULL)
-               return ((!IsEmptyStr(WCC->ImportantMessage)) || 
-                       (StrLength(WCC->ImportantMsg) > 0));
+               return (StrLength(WCC->ImportantMsg) > 0);
        else
                return 0;
 }
@@ -940,11 +921,7 @@ void tmplput_importantmessage(StrBuf *Target, WCTemplputParams *TP)
        wcsession *WCC = WC;
        
        if (WCC != NULL) {
-               if (!IsEmptyStr(WCC->ImportantMessage)) {
-                       StrEscAppend(Target, NULL, WCC->ImportantMessage, 0, 0);
-                       WCC->ImportantMessage[0] = '\0';
-               }
-               else if (StrLength(WCC->ImportantMsg) > 0) {
+               if (StrLength(WCC->ImportantMsg) > 0) {
                        StrEscAppend(Target, WCC->ImportantMsg, NULL, 0, 0);
                        FlushStrBuf(WCC->ImportantMsg);
                }
@@ -1001,11 +978,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);
 
 }