X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=d1b0f20817cc3b2bbe6f5584573b2d5ae6380516;hb=HEAD;hp=d713aaea9a91df089caece3368b43ab49cd8b74d;hpb=8466d8b28b351b312de94daa6ed216294fbb601c;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index d713aaea9..ec6306ecc 100644 --- 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("\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("\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: @@ -1799,14 +1793,13 @@ void postpart(StrBuf *partnum, StrBuf *filename, int force_download) { } -/* - * Generic function to output an arbitrary MIME part from an arbitrary - * message number on the server. - * - * msgnum message number on the citadel server - * partnum MIME part number to be output - * force_download Nonzero to force set the Content-Type: header to "application/octet-stream" - */ +// Generic function to output an arbitrary MIME part from an arbitrary +// message number on the server. +// +// msgnum message number on the citadel server +// partnum MIME part number to be output +// force_download Nonzero to force set the Content-Type: header to "application/octet-stream" + void view_or_download_mimepart(int force_download) { long msgnum; off_t bytes;