* put QP Decoder intoo its own file

[citadel.git] / webcit / webcit.c

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 51105a76bb72052be0eacf27ea2d6bf4bf456cb9..9c738b1f53f51bc80037afaeb160f8d2bd0fb357 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -95,19 +95,15 @@ void free_url(void *U)
 /*
  * Extract variables from the URL.
  */
-void addurls(StrBuf *url)
+void ParseURLParams(StrBuf *url)
 {
        const char *aptr, *bptr, *eptr, *up;
-///    char *buf;
        int len, keylen;
        urlcontent *u;
        struct wcsession *WCC = WC;
 
        if (WCC->urlstrings == NULL)
                WCC->urlstrings = NewHash(1, NULL);
-//     buf = (char*) malloc (ulen + 1);
-//     memcpy(buf, url, ulen);
-///    buf[ulen] = '\0';
        eptr = ChrPtr(url) + StrLength(url);
        up = ChrPtr(url);
        while ((up < eptr) && (!IsEmptyStr(up))) {
@@ -115,17 +111,14 @@ void addurls(StrBuf *url)
                while ((aptr < eptr) && (*aptr != '\0') && (*aptr != '='))
                        aptr++;
                if (*aptr != '=') {
-                       ///free(buf);
                        return;
                }
-               ///*aptr = '\0';
                aptr++;
                bptr = aptr;
                while ((bptr < eptr) && (*bptr != '\0')
                      && (*bptr != '&') && (*bptr != '?') && (*bptr != ' ')) {
                        bptr++;
                }
-               //*bptr = '\0';
                keylen = aptr - up - 1; /* -1 -> '=' */
                if(keylen > sizeof(u->url_key)) {
                        lprintf(1, "URLkey to long! [%s]", up);
@@ -155,7 +148,6 @@ void addurls(StrBuf *url)
                        ChrPtr(u->url_data)); 
 #endif
        }
-       //free(buf);
 }
 
 /*
@@ -390,18 +382,22 @@ void hprintf(const char *format,...)
 }
 
 
+void put_trailing_javascript(void) {
+       wprintf("%s", ChrPtr(WC->trailing_javascript));
+}
+
 /*
  * wrap up an HTTP session, closes tags, etc.
  *
  * print_standard_html_footer should be set to:
- * 0 to transmit only,
- * 1 to append the main menu and closing tags,
- * 2 to append the closing tags only.
+ * 0           - to transmit only,
+ * nonzero     - to append the closing tags
  */
 void wDumpContent(int print_standard_html_footer)
 {
        if (print_standard_html_footer) {
-               wprintf("</div>\n");    /* end of "text" div */
+               wprintf("</div> <!-- end of 'content' div -->\n");
+               svcallback("TRAILING_JAVASCRIPT", put_trailing_javascript);
                do_template("trailing", NULL);
        }
 
@@ -952,6 +948,45 @@ void display_vcard_photo_img(void)
        free(photosrc);
 }
 
+/*
+ * Generic function to output an arbitrary MIME attachment from
+ * message being composed
+ *
+ * partnum             The MIME part to be output
+ * filename            Fake filename to give
+ * force_download      Nonzero to force set the Content-Type: header to "application/octet-stream"
+ */
+void postpart(const char *partnum, const char *filename, int force_download)
+{
+       char content_type[256];
+       int num = atoi(partnum);
+       struct wc_attachment *part = WC->first_attachment;
+
+       while(num && part) {
+               num--;
+               part=part->next;
+       }
+       
+       if (part) {
+               if (force_download) {
+                       strcpy(content_type, "application/octet-stream");
+               }
+               else {
+                       strncpy(content_type, part->content_type, sizeof content_type);
+               }
+               output_headers(0, 0, 0, 0, 0, 0);
+               StrBufAppendBufPlain(WC->WBuf, part->data, part->length, 0);
+               http_transmit_thing(content_type, 0);
+       } else {
+               hprintf("HTTP/1.1 404 %s\n",partnum);
+               output_headers(0, 0, 0, 0, 0, 0);
+               hprintf("Content-Type: text/plain\r\n");
+               wprintf(_("An error occurred while retrieving this part: %s/%s\n"), partnum, filename);
+               end_burst();
+       }
+}
+
+
 /*
  * Generic function to output an arbitrary MIME part from an arbitrary
  * message number on the server.
@@ -1376,6 +1411,7 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method
        WCC->upload_length = 0;
        WCC->upload = NULL;
        WCC->is_mobile = 0;
+       WCC->trailing_javascript = NewStrBuf();
 
        /** Figure out the action */
        index[0] = action;
@@ -1477,7 +1513,7 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method
 
                if (!strncasecmp(ChrPtr(ContentType), "application/x-www-form-urlencoded", 33)) {
                        StrBufCutLeft(content, body_start);
-                       addurls(content);
+                       ParseURLParams(content);
                } else if (!strncasecmp(ChrPtr(ContentType), "multipart", 9)) {
                        content_end = ChrPtr(content) + ContentLength + body_start;
                        mime_parser(ChrPtr(content), content_end, *upload_handler, NULL, NULL, NULL, 0);
@@ -1499,7 +1535,7 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method
        while (pch < pche) {
                if ((*pch == '?') || (*pch == '&')) {
                        StrBufCutLeft(UrlLine, pch - pchs + 1);
-                       addurls(UrlLine);
+                       ParseURLParams(UrlLine);
                        break;
                }
                pch ++;
@@ -1601,6 +1637,7 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method
 
                        get_serv_info(browser_host, user_agent);
                        if (serv_info.serv_rev_level < MINIMUM_CIT_VERSION) {
+                               begin_burst();
                                wprintf(_("You are connected to a Citadel "
                                        "server running Citadel %d.%02d. \n"
                                        "In order to run this version of WebCit "
@@ -1611,6 +1648,7 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method
                                                MINIMUM_CIT_VERSION / 100,
                                                MINIMUM_CIT_VERSION % 100
                                        );
+                               end_burst();
                                end_webcit_session();
                                goto SKIP_ALL_THIS_CRAP;
                        }
@@ -1711,6 +1749,7 @@ void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method
                                        set_selected_language(ChrPtr(Lang));
                                        go_selected_language();         /* set locale */
                                }
+                               get_preference("default_header_charset", &WCC->DefaultCharset);
                        }
                }
        }
@@ -1776,6 +1815,7 @@ SKIP_ALL_THIS_CRAP:
                free(WCC->upload);
                WCC->upload_length = 0;
        }
+       FreeStrBuf(&WCC->trailing_javascript);
 }
 
 
@@ -1818,6 +1858,18 @@ void download_mimepart(void) {
                 1);
 }
 
+void view_postpart(void) {
+       postpart(ChrPtr(WC->UrlFragment1),
+                ChrPtr(WC->UrlFragment2),
+                0);
+}
+
+void download_postpart(void) {
+       postpart(ChrPtr(WC->UrlFragment1),
+                ChrPtr(WC->UrlFragment2),
+                1);
+}
+
 
 int ConditionalImportantMesage(WCTemplateToken *Tokens, void *Context, int ContextType)
 {
@@ -1869,6 +1921,8 @@ InitModule_WEBCIT
        WebcitAddUrlHandler(HKEY("vcardphoto"), display_vcard_photo_img, NEED_URL);
        WebcitAddUrlHandler(HKEY("mimepart"), view_mimepart, NEED_URL);
        WebcitAddUrlHandler(HKEY("mimepart_download"), download_mimepart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart"), view_postpart, NEED_URL);
+       WebcitAddUrlHandler(HKEY("postpart_download"), download_postpart, NEED_URL);
        WebcitAddUrlHandler(HKEY("diagnostics"), diagnostics, NEED_URL);
 
        RegisterConditional(HKEY("COND:IMPMSG"), 0, ConditionalImportantMesage, CTX_NONE);