X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmessages.c;h=d1b0f20817cc3b2bbe6f5584573b2d5ae6380516;hb=HEAD;hp=ab3602f2a6c76dc55a3a373c2184d4359223a6b6;hpb=48bcbd11180a2bde2122f774e411f938ff85e1a6;p=citadel.git diff --git a/webcit/messages.c b/webcit/messages.c index ab3602f2a..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" @@ -305,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: @@ -905,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); @@ -918,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) { @@ -945,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); @@ -1536,7 +1538,7 @@ void display_enter(void) { case eXclusivID: case eJournal: case eListID: - case eMesageText: + case eMessageText: case eMessagePath: case eSpecialField: case eTimestamp: