projects / citadel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
final touches on dkim test harness
[citadel.git] / webcit / messages.c
diff --git a/webcit/messages.c b/webcit/messages.c
index e474a7a06d0b909c1259a737931d9d76f1b5ed56..ec6306ecc57c960fce531c7b212c216651aba8da 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -17,7 +17,7 @@
 // GNU General Public License for more details.
 
 #include "webcit.h"
-#include "webserver.h"
+
 #include "dav.h"
 #include "calendar.h"
 
@@ -181,7 +181,6 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
        Msg = (message_summary *)malloc(sizeof(message_summary));
        if (!Msg) {
                syslog(LOG_DEBUG, "malloc() error");
-               TRACE;
        }
        memset(Msg, 0, sizeof(message_summary));
        Msg->msgnum = msgnum;
@@ -189,7 +188,6 @@ int read_message(StrBuf *Target, const char *tmpl, long tmpllen, long msgnum, co
        Msg->MsgBody =  (wc_mime_attachment*) malloc(sizeof(wc_mime_attachment));
        if (!Msg->MsgBody) {
                syslog(LOG_DEBUG, "malloc() error");
-               TRACE;
        }
        memset(Msg->MsgBody, 0, sizeof(wc_mime_attachment));
        Msg->MsgBody->msgnum = msgnum;
@@ -307,7 +305,7 @@ long HttpStatus(long CitadelStatus) {
        default:
        case BINARY_FOLLOWS:
        case SEND_BINARY:
-       case START_CHAT_MODE:
+       case SEND_THEN_RECV:
        case ASYNC_MSG:
        case MORE_DATA:
        case SEND_LISTING:
@@ -544,7 +542,6 @@ int load_msg_ptrs(const char *servcmd,
                        Msg = (message_summary*)malloc(sizeof(message_summary));
                        if (!Msg) {
                                syslog(LOG_DEBUG, "malloc() error");
-                               TRACE;
                        }
                        memset(Msg, 0, sizeof(message_summary));
 
@@ -908,7 +905,7 @@ void post_mime_to_server(void) {
                serv_puts("Content-type: text/plain; charset=utf-8");
                serv_puts("Content-Transfer-Encoding: quoted-printable");
                serv_puts("");
-               txtmail = html_to_ascii(bstr("msgtext"), 0, 80);
+               txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
                Buf = NewStrBufPlain(txtmail, -1);
                free(txtmail);
 
@@ -921,7 +918,9 @@ void post_mime_to_server(void) {
        serv_puts("Content-Transfer-Encoding: quoted-printable");
        serv_puts("");
        serv_puts("<html><body>\r\n");
-       text_to_server_qp(sbstr("msgtext"));    /* Transmit message in quoted-printable encoding */
+       if (havebstr("msgtext")) {
+               text_to_server_qp(sbstr("msgtext"));    /* Transmit message in quoted-printable encoding */
+       }
        serv_puts("</body></html>\r\n");
 
        if (include_text_alt) {
@@ -948,7 +947,7 @@ void post_mime_to_server(void) {
                                break;
                        }
                        syslog(LOG_DEBUG, "Attachment: raw len %d", StrLength(att->Data));
-                       encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), 1);
+                       encoded_strlen = CtdlEncodeBase64(encoded, ChrPtr(att->Data), StrLength(att->Data), BASE64_YES_LINEBREAKS);
                        syslog(LOG_DEBUG, "Attachment: encoded len %d", encoded_strlen);
 
                        serv_printf("--%s", top_boundary);
@@ -961,14 +960,10 @@ void post_mime_to_server(void) {
                        serv_puts("");
                        free(encoded);
                }
-               syslog(LOG_DEBUG, "\033[33m sending final boundary --%s-- \033[0m", top_boundary);
-               TRACE;
                serv_printf("--%s--", top_boundary);
                DeleteHashPos(&it);
        }
 
-       syslog(LOG_DEBUG, "\033[33m sending terminating 000 \033[0m");
-       TRACE;
        serv_puts("000");
 }
 
@@ -1233,7 +1228,6 @@ void upload_attachment(void) {
        att = (wc_mime_attachment*)malloc(sizeof(wc_mime_attachment));
        if (!att) {
                syslog(LOG_DEBUG, "malloc() error");
-               TRACE;
        }
        memset(att, 0, sizeof(wc_mime_attachment ));
        att->length = WC->upload_length;
@@ -1544,7 +1538,7 @@ void display_enter(void) {
                                        case eXclusivID:
                                        case eJournal:
                                        case eListID:
-                                       case eMesageText:
+                                       case eMessageText:
                                        case eMessagePath:
                                        case eSpecialField:
                                        case eTimestamp:
@@ -1839,9 +1833,6 @@ void view_or_download_mimepart(int force_download) {
        StrBufCutLeft(Buf, 4);
        bytes = StrBufExtract_long(Buf, 0, '|');
 
-       syslog(LOG_DEBUG, "\033[31mview or download %ld bytes\033[0m", bytes);
-
-
        if (force_download) {
                ContentType = NewStrBufPlain(HKEY("application/octet-stream"));
        }
Citadel server, clients, utilities