From cabff78033d31b0941b27e901c8952eeb461ae46 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Wed, 28 Jan 2009 22:28:05 +0000
Subject: [PATCH] * load inline texts with DLAT not MSG4 * add download link to
 inline texts; maybe the framed divs display_inline_attachment and
 display_inline_attachment_body could use some styling

---
 webcit/msg_renderers.c                          | 12 +++++++-----
 webcit/static/t/view_message_inline_attach.html |  7 +++++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 8ad271b78..ec367e380 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -239,7 +239,6 @@ int Conditional_ANONYMOUS_MESSAGE(StrBuf *Target, WCTemplputParams *TP)
 	return Msg->nhdr != 0;
 }
 
-
 void examine_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	Msg->format_type = StrToi(HdrLine);
@@ -782,9 +781,7 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 
 	if ((StrLength(Mime->Data) == 0) && (Mime->length > 0)) {
 		FreeStrBuf(&Mime->Data);
-		Mime->Data = NewStrBufPlain(NULL, Mime->length);
-		if (!read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, 0, Mime->PartNum))
-			return;
+		MimeLoadData(Mime);
 	}
 
 	/* Boring old 80-column fixed format text gets handled this way... */
@@ -866,8 +863,13 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 		iconv_close(ic);
 	}
 #endif
+
 	FreeStrBuf(&Mime->Data);
 	Mime->Data = Target;
+	FlushStrBuf(Mime->ContentType);
+	StrBufAppendBufPlain(Mime->ContentType, HKEY("text/html"), 0);
+	FlushStrBuf(Mime->Charset);
+	StrBufAppendBufPlain(Mime->Charset, HKEY("UTF-8"), 0);
 	FreeStrBuf(&Line);
 	FreeStrBuf(&Line1);
 	FreeStrBuf(&Line2);
@@ -1126,7 +1128,7 @@ InitModule_MSGRENDERERS
 	RegisterConditional(HKEY("COND:MAIL:SUMM:H_NODE"), 0, Conditional_MAIL_SUMM_H_NODE, CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:SUMM:OTHERNODE"), 0, Conditional_MAIL_SUMM_OTHERNODE, CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:ANON"), 0, Conditional_ANONYMOUS_MESSAGE, CTX_MAILSUM);
-
+	
 
 	/* do we have mimetypes to iterate over? */
 	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH"), 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM);
diff --git a/webcit/static/t/view_message_inline_attach.html b/webcit/static/t/view_message_inline_attach.html
index aa57ae280..5bad20f6a 100644
--- a/webcit/static/t/view_message_inline_attach.html
+++ b/webcit/static/t/view_message_inline_attach.html
@@ -1 +1,8 @@
+<div class="display_inline_attachment">
+<img src="display_mime_icon?type=<?MAIL:MIME:CONTENTTYPE("U")>" border=0 align=middle>
+<?MAIL:MIME:FILENAME("X")>  (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes) 
+<a href="mimepart_download/<?MAIL:MIME:MSGNUM>/<?MAIL:MIME:PARTNUM>/<?MAIL:MIME:FILENAME("U")>"><?_("Download")></a><br />
+<div class="display_inline_attachment_body">
 <?MAIL:MIME:DATA>
+</div>
+</div>
-- 
2.30.2