Markdown: Properly escape stuff on the way to the server; fix loading & saving from...

[citadel.git] / webcit / messages.c
diff --git a/webcit/messages.c b/webcit/messages.c

index 3eaef681715a05c7e64417c55562242b8e8bc088..9f9f9730f7b9bd291fc06ab85c192b98cadd434b 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -930,6 +930,7 @@ void post_mime_to_server(void) {
  
         /* Remember, serv_printf() appends an extra newline */
         if (include_text_alt) {
+               StrBuf *Buf;
                 serv_printf("Content-type: multipart/alternative; "
                         "boundary=\"%s\"\n", alt_boundary);
                 serv_printf("This is a multipart message in MIME format.\n");
@@ -939,18 +940,30 @@ void post_mime_to_server(void) {
                 serv_puts("Content-Transfer-Encoding: quoted-printable");
                 serv_puts("");
                 txtmail = html_to_ascii(bstr("msgtext"), 0, 80, 0);
-               text_to_server_qp(txtmail);     /* Transmit message in quoted-printable encoding */
+               Buf = NewStrBufPlain(txtmail, -1);
                 free(txtmail);
  
+               text_to_server_qp(Buf);     /* Transmit message in quoted-printable encoding */
+               FreeStrBuf(&Buf);
                 serv_printf("\n--%s", alt_boundary);
         }
  
-       serv_puts("Content-type: text/html; charset=utf-8");
-       serv_puts("Content-Transfer-Encoding: quoted-printable");
-       serv_puts("");
-       serv_puts("<html><body>\r\n");
-       text_to_server_qp(bstr("msgtext"));     /* Transmit message in quoted-printable encoding */
-       serv_puts("</body></html>\r\n");
+       if (havebstr("markdown"))
+       {
+               serv_puts("Content-type: text/x-markdown; charset=utf-8");
+               serv_puts("Content-Transfer-Encoding: quoted-printable");
+               serv_puts("");
+               text_to_server_qp(sbstr("msgtext"));    /* Transmit message in quoted-printable encoding */
+       }
+       else
+       {
+               serv_puts("Content-type: text/html; charset=utf-8");
+               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 */
+               serv_puts("</body></html>\r\n");
+       }
  
         if (include_text_alt) {
                 serv_printf("--%s--", alt_boundary);
@@ -1695,7 +1708,10 @@ void display_enter(void)
  
         begin_burst();
         output_headers(1, 0, 0, 0, 1, 0);
-       DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
+       if (WCC->CurRoom.defview == VIEW_WIKIMD) 
+               DoTemplate(HKEY("edit_markdown_epic"), NULL, &NoCtx);
+       else
+               DoTemplate(HKEY("edit_message"), NULL, &NoCtx);
         end_burst();
  
         return;