From 3b560cc584c46f391554a60ea334916909372125 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 8 Dec 2013 14:21:51 +0100
Subject: [PATCH] MarkdownWiki: put original text into edit-textarea, not the
 html'ified version.

---
 webcit/msg_renderers.c                  | 25 ++++++++++++++++---------
 webcit/static/t/edit/markdown_epic.html | 12 +++++++++++-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 922ff6201..64518a405 100644
--- 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);
@@ -1150,20 +1151,26 @@ void render_MAIL_markdown(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCha
 	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_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);
+	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
 
diff --git a/webcit/static/t/edit/markdown_epic.html b/webcit/static/t/edit/markdown_epic.html
index a00a9b38a..2bc4f9eb6 100644
--- a/webcit/static/t/edit/markdown_epic.html
+++ b/webcit/static/t/edit/markdown_epic.html
@@ -14,10 +14,18 @@
     </div>
 </div>
 
+<div id="Author">
+<select name="display_name" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_handle_select")>
+<?!("COND:THISROOM:FLAG:QR", 3, #"QR_ANONOPT")>
+<option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
+<?!("X", 3)>
+</select>
+</div>
 <div id="epiceditor">
 
 
-<textarea id="msgtext" cols="80" rows="15"></textarea>
+<textarea id="msgtext" cols="80" rows="15"><?MAIL:EDITWIKI("edit", "X")></textarea>
 </div>
 
 </div>
@@ -75,12 +83,14 @@
     console.log('blub');
 
 	function submit_post(which_action) {
+	    
 	var p = { "postseq":"<?DATE:NOW:NO>",
 		  "return_to":"<?BSTR("return_to")>",
 		  "nonce":"<?NONCE>",
 		  "force_room":"<?THISROOM:NAME("X")>",
 		  "references":"<?BSTR("references")>",
 		  "page":"<?BSTR("page")>",
+		  "display_name":"willi",
 		  "submit_action":"",
 		  "markdown":"1",
 		  "msgtext" : editor.exportFile()
-- 
2.30.2