continuing war on unnecessary include of sys/time.h

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 2132a2dd42f2271c196cf0d5c6e9e38e846eb4af..64518a40574501e5af15dab5bbe43c0a07595f34 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -958,6 +958,7 @@ void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
         */
        if (!havebstr("attach_button")) {
                char *wikipage = strdup(bstr("page"));
+               putbstr("format", NewStrBufPlain(HKEY("plain")));
                str_wiki_index(wikipage);
                msgnum = locate_message_by_uid(wikipage);
                free(wikipage);
@@ -1138,25 +1139,38 @@ void render_MAIL_html(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset
 }
 
 #ifdef HAVE_MARKDOWN
+/*
+char * MarkdownHandleURL(const char* SourceURL, const int len, void* something)
+{
+
+}
+*/
 void render_MAIL_markdown(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
 #include <mkdio.h>
        wc_mime_attachment *Mime = (wc_mime_attachment *) CTX(CTX_MIME_ATACH);
        MMIOT *doc;
        char *md_as_html = NULL;
+       const char *format;
 
        if (StrLength(Mime->Data) == 0)
                return;
 
-       doc = mkd_string(ChrPtr(Mime->Data), StrLength(Mime->Data), 0);
-       mkd_compile(doc, 0);
-       if (mkd_document(doc, &md_as_html) != EOF) {
-               FreeStrBuf(&Mime->Data);
-               Mime->Data = NewStrBufPlain(md_as_html, -1);
-       }
-//     free(md_as_html);
-       mkd_cleanup(doc);
+       format = bstr("format");
 
+       if ((format == NULL) || 
+           strcmp(format, "plain"))
+       {
+               doc = mkd_string(ChrPtr(Mime->Data), StrLength(Mime->Data), 0);
+               mkd_basename(doc, "/wiki?page=");
+               mkd_compile(doc, 0);
+               if (mkd_document(doc, &md_as_html) != EOF) {
+                       FreeStrBuf(&Mime->Data);
+                       Mime->Data = NewStrBufPlain(md_as_html, -1);
+               }
+//     free(md_as_html);
+               mkd_cleanup(doc);
+       }
 }
 #endif