]> code.citadel.org Git - citadel.git/blobdiff - webcit/webcit.c
projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rename wprintf to wc_printf; wchar.h also has a wprintf
[citadel.git] / webcit / webcit.c
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 25b13ab1f673c107521595500f725c771594fd96..279fc7dcff5bccbd8be8c2b13b0f30db9f33151d 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -31,8 +31,8 @@ void DeleteWebcitHandler(void *vHandler)
 
 }
 
-void WebcitAddUrlHandler(const char * UrlString, 
-                        long UrlSLen, 
+void WebcitAddUrlHandler(const char * UrlString, long UrlSLen, 
+                        const char *DisplayName, long dslen,
                         WebcitHandlerFunc F, 
                         long Flags)
 {
@@ -42,6 +42,8 @@ void WebcitAddUrlHandler(const char * UrlString,
        NewHandler->Flags = Flags;
        NewHandler->Name = NewStrBufPlain(UrlString, UrlSLen);
        StrBufShrinkToFit(NewHandler->Name, 1);
+       NewHandler->DisplayName = NewStrBufPlain(DisplayName, dslen);
+       StrBufShrinkToFit(NewHandler->DisplayName, 1);
        Put(HandlerHash, UrlString, UrlSLen, NewHandler, DeleteWebcitHandler);
 }
 
@@ -49,7 +51,7 @@ void WebcitAddUrlHandler(const char * UrlString,
 /*
  * web-printing funcion. uses our vsnprintf wrapper
  */
-void wprintf(const char *format,...)
+void wc_printf(const char *format,...)
 {
        wcsession *WCC = WC;
        va_list arg_ptr;
@@ -87,7 +89,7 @@ void hprintf(const char *format,...)
 void wDumpContent(int print_standard_html_footer)
 {
        if (print_standard_html_footer) {
-               wprintf("</div> <!-- end of 'content' div -->\n");
+               wc_printf("</div> <!-- end of 'content' div -->\n");
                do_template("trailing", NULL);
        }
 
@@ -183,10 +185,10 @@ void output_headers(      int do_httpheaders,     /* 1 = output HTTP headers
 
                /* check for ImportantMessages (these display in a div overlaying the main screen) */
                if (!IsEmptyStr(WCC->ImportantMessage)) {
-                       wprintf("<div id=\"important_message\">\n"
+                       wc_printf("<div id=\"important_message\">\n"
                                "<span class=\"imsg\">");
                        StrEscAppend(WCC->WBuf, NULL, WCC->ImportantMessage, 0, 0);
-                       wprintf("</span><br />\n"
+                       wc_printf("</span><br />\n"
                                "</div>\n"
                        );
                        StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -196,10 +198,10 @@ void output_headers(      int do_httpheaders,     /* 1 = output HTTP headers
                        WCC->ImportantMessage[0] = 0;
                }
                else if (StrLength(WCC->ImportantMsg) > 0) {
-                       wprintf("<div id=\"important_message\">\n"
+                       wc_printf("<div id=\"important_message\">\n"
                                "<span class=\"imsg\">");
                        StrEscAppend(WCC->WBuf, WCC->ImportantMsg, NULL, 0, 0);
-                       wprintf("</span><br />\n"
+                       wc_printf("</span><br />\n"
                                "</div>\n"
                        );
                        StrBufAppendBufPlain(WCC->trailing_javascript,
@@ -213,14 +215,14 @@ void output_headers(      int do_httpheaders,     /* 1 = output HTTP headers
                }
 
                if (do_room_banner == 1) {
-                       wprintf("<div id=\"banner\">\n");
+                       wc_printf("<div id=\"banner\">\n");
                        embed_room_banner(NULL, navbar_default);
-                       wprintf("</div>\n");
+                       wc_printf("</div>\n");
                }
        }
 
        if (do_room_banner == 1) {
-               wprintf("<div id=\"content\">\n");
+               wc_printf("<div id=\"content\">\n");
        }
 }
 
@@ -241,9 +243,9 @@ void http_redirect(const char *whichpage) {
        hprintf("URI: %s\r\n", whichpage);
        hprintf("Content-type: text/html; charset=utf-8\r\n");
        begin_burst();
-       wprintf("<html><body>");
-       wprintf("Go <a href=\"%s\">here</A>.", whichpage);
-       wprintf("</body></html>\n");
+       wc_printf("<html><body>");
+       wc_printf("Go <a href=\"%s\">here</A>.", whichpage);
+       wc_printf("</body></html>\n");
        end_burst();
 }
 
@@ -284,14 +286,14 @@ void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const
 {
        hprintf("HTTP/1.1 200 OK\n");
        output_headers(1, 1, 2, 0, 0, 0);
-       wprintf("<div id=\"banner\">\n");
-       wprintf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
-       wprintf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
-       wprintf("</td></tr></table>\n");
-       wprintf("</div>\n<div id=\"content\">\n");
+       wc_printf("<div id=\"banner\">\n");
+       wc_printf("<table width=100%% border=0 bgcolor=\"#%s\"><tr><td>", titlebarcolor);
+       wc_printf("<span class=\"titlebar\">%s</span>\n", titlebarmsg);
+       wc_printf("</td></tr></table>\n");
+       wc_printf("</div>\n<div id=\"content\">\n");
        escputs(messagetext);
 
-       wprintf("<hr />\n");
+       wc_printf("<hr />\n");
        wDumpContent(1);
 }
 
@@ -345,9 +347,9 @@ void authorization_required(void)
        hprintf("WWW-Authenticate: Basic realm=\"%s\"\r\n", ChrPtr(WC->serv_info->serv_humannode));
        hprintf("Content-Type: text/html\r\n");
        begin_burst();
-       wprintf("<h1>");
-       wprintf(_("Authorization Required"));
-       wprintf("</h1>\r\n");
+       wc_printf("<h1>");
+       wc_printf(_("Authorization Required"));
+       wc_printf("</h1>\r\n");
        
 
        if (WCC->ImportantMsg != NULL)
@@ -355,7 +357,7 @@ void authorization_required(void)
        else if (WCC->ImportantMessage != NULL)
                message = WCC->ImportantMessage;
 
-       wprintf(_("The resource you requested requires a valid username and password. "
+       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();
@@ -464,17 +466,17 @@ void seconds_since_last_gexp(void)
        char buf[256];
 
        if ( (time(NULL) - WC->last_pager_check) < 30) {
-               wprintf("NO\n");
+               wc_printf("NO\n");
        }
        else {
                memset(buf, 0, 5);
                serv_puts("NOOP");
                serv_getln(buf, sizeof buf);
                if (buf[3] == '*') {
-                       wprintf("YES");
+                       wc_printf("YES");
                }
                else {
-                       wprintf("NO");
+                       wc_printf("NO");
                }
        }
 }
@@ -521,6 +523,7 @@ void ReadPostData(void)
                free(Buf);
        } else if (WCC->Hdr->HR.ContentLength > 0) {
                WCC->upload = content;
+               WCC->upload_length = StrLength(WCC->upload);
                content = NULL;
        }
        FreeStrBuf(&content);
@@ -530,9 +533,12 @@ void ReadPostData(void)
 void ParseREST_URL(void)
 {
        StrBuf *Buf;
+       StrBuf *pFloor = NULL;
        wcsession *WCC = WC;
        long i = 0;
        const char *pCh = NULL;
+       HashList *Floors;
+       void *vFloor;
 
        WCC->Directory = NewHash(1, Flathash);
 
@@ -541,11 +547,23 @@ void ParseREST_URL(void)
                                       Buf, &pCh,  '/') >= 0)
        {
                Put(WCC->Directory, IKEY(i), Buf, HFreeStrBuf);
+               if (i==0)
+                       pFloor = Buf;
                i++;
                Buf = NewStrBuf();
        }
        if (i == 0)
                FreeStrBuf(&Buf);
+       else if (pFloor != NULL)
+       {
+               Floors = GetFloorListHash(NULL, NULL);
+               
+               if (Floors != NULL)
+               {
+                       if (GetHash(Floors, SKEY(pFloor), &vFloor))
+                               WCC->CurrentFloor = (floor*) vFloor;
+               }
+       }
 }
 
 
@@ -596,7 +614,7 @@ void session_loop(void)
                        hprintf("HTTP/1.1 404 Security check failed\r\n");
                        hprintf("Content-Type: text/plain\r\n\r\n");
                        begin_burst();
-                       wprintf("Security check failed.\r\n");
+                       wc_printf("Security check failed.\r\n");
                        end_burst();
                        goto SKIP_ALL_THIS_CRAP;
                }
@@ -780,17 +798,17 @@ InitModule_WEBCIT
 (void)
 {
        char dir[SIZ];
-       WebcitAddUrlHandler(HKEY("blank"), blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
-       WebcitAddUrlHandler(HKEY("do_template"), url_do_template, ANONYMOUS);
-       WebcitAddUrlHandler(HKEY("sslg"), seconds_since_last_gexp, AJAX|LOGCHATTY);
-       WebcitAddUrlHandler(HKEY("ajax_servcmd"), ajax_servcmd, 0);
-       WebcitAddUrlHandler(HKEY("webcit"), blank_page, URLNAMESPACE);
+       WebcitAddUrlHandler(HKEY("blank"), "", 0, blank_page, ANONYMOUS|COOKIEUNNEEDED|ISSTATIC);
+       WebcitAddUrlHandler(HKEY("do_template"), "", 0, url_do_template, ANONYMOUS);
+       WebcitAddUrlHandler(HKEY("sslg"), "", 0, seconds_since_last_gexp, AJAX|LOGCHATTY);
+       WebcitAddUrlHandler(HKEY("ajax_servcmd"), "", 0, ajax_servcmd, 0);
+       WebcitAddUrlHandler(HKEY("webcit"), "", 0, blank_page, URLNAMESPACE);
 
-       WebcitAddUrlHandler(HKEY("401"), authorization_required, ANONYMOUS|COOKIEUNNEEDED);
+       WebcitAddUrlHandler(HKEY("401"), "", 0, authorization_required, ANONYMOUS|COOKIEUNNEEDED);
        RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);
-       RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, CTX_NONE);
-       RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, CTX_NONE);
-       RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, CTX_NONE);
+       RegisterNamespace("CSSLOCAL", 0, 0, tmplput_csslocal, NULL, CTX_NONE);
+       RegisterNamespace("IMPORTANTMESSAGE", 0, 0, tmplput_importantmessage, NULL, CTX_NONE);
+       RegisterNamespace("TRAILING_JAVASCRIPT", 0, 0, tmplput_trailing_javascript, NULL, CTX_NONE);
 
        snprintf(dir, SIZ, "%s/webcit.css", static_local_dir);
        if (!access(dir, R_OK)) {
@@ -833,11 +851,11 @@ void
 SessionDetachModule_WEBCIT
 (wcsession *sess)
 {
-       DeleteHash(&sess->Hdr->urlstrings);// TODO?
-       if (sess->upload_length > 0) {
-               FreeStrBuf(&sess->upload);
-               sess->upload_length = 0;
-       }
+       DeleteHash(&sess->Directory);
+
+       FreeStrBuf(&sess->upload);
+       sess->upload_length = 0;
+       
        FreeStrBuf(&sess->trailing_javascript);
 
        if (StrLength(sess->WBuf) > SIZ * 30) /* Bigger than 120K? release. */
Citadel server, clients, utilities