X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=e936439db914d4659af28f4faaef4892251cb6a8;hb=77402608e1a9783396cee83511fc318220a348da;hp=97b454abdbdf3cfa4f1ee2c4361f3ca6503c2eff;hpb=b73b5cda73bc2a5f5fa77a9caee5a542ad1c1475;p=citadel.git

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 97b454abd..e936439db 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -1,5 +1,6 @@
 #include "webcit.h"
 #include "webserver.h"
+#include "groupdav.h"
 
 /*
  * message index functions
@@ -60,14 +61,18 @@ void RegisterMsgHdr(const char *HeaderName, long HdrNLen, ExamineMsgHeaderFunc e
 	Put(MsgHeaderHandler, HeaderName, HdrNLen, ev, NULL);
 }
 
-void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, RenderMimeFunc MimeRenderer)
+void RegisterMimeRenderer(const char *HeaderName, long HdrNLen, 
+			  RenderMimeFunc MimeRenderer,
+			  int InlineRenderable,
+			  int Priority)
 {
 	RenderMimeFuncStruct *f;
 
 	f = (RenderMimeFuncStruct*) malloc(sizeof(RenderMimeFuncStruct));
 	f->f = MimeRenderer;
 	Put(MimeRenderHandler, HeaderName, HdrNLen, f, NULL);
-	
+	if (InlineRenderable)
+		RegisterEmbeddableMimeType(HeaderName, HdrNLen, 10000 - Priority);
 }
 
 /*----------------------------------------------------------------------------*/
@@ -256,8 +261,6 @@ void tmplput_MAIL_SUMM_FROM(StrBuf *Target, WCTemplputParams *TP)
 	StrBufAppendTemplate(Target, TP, Msg->from, 0);
 }
 
-
-
 void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	FreeStrBuf(&Msg->subj);
@@ -265,14 +268,29 @@ void examine_subj(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	StrBuf_RFC822_to_Utf8(Msg->subj, HdrLine, WC->DefaultCharset, FoundCharset);
 }
 void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
-{/*////TODO: Fwd: and RE: filter!!*/
-
+{
 	message_summary *Msg = (message_summary*) CTX;
+
+	if (TP->Tokens->nParameters == 4)
+	{
+		const char *pch;
+		long len;
+		
+		GetTemplateTokenString(Target, TP, 3, &pch, &len);
+		if ((len > 0)&&
+		    (strstr(ChrPtr(Msg->subj), pch) == NULL))
+		{
+			GetTemplateTokenString(Target, TP, 2, &pch, &len);
+			StrBufAppendBufPlain(Target, pch, len, 0);
+		}
+	}
 	StrBufAppendTemplate(Target, TP, Msg->subj, 0);
 }
 int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
 {
 	message_summary *Msg = (message_summary*) CTX;
+
+
 	return StrLength(Msg->subj) > 0;
 }
 
@@ -330,7 +348,7 @@ void tmplput_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
 void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	if ((StrLength(HdrLine) > 0) &&
-	    (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->wc_roomname)))) {
+	    (strcasecmp(ChrPtr(HdrLine), ChrPtr(WC->CurRoom.name)))) {
 		FreeStrBuf(&Msg->Room);
 		Msg->Room = NewStrBufDup(HdrLine);		
 	}
@@ -368,7 +386,7 @@ void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	wcsession *WCC = WC;
 
 	if ( (StrLength(HdrLine) > 0) &&
-	     ((WC->room_flags & QR_NETWORK)
+	     ((WC->CurRoom.QRFlags & QR_NETWORK)
 	      || ((strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_nodename))
 		   && (strcasecmp(ChrPtr(HdrLine), ChrPtr(WCC->serv_info->serv_fqdn))))))) {
 		FreeStrBuf(&Msg->OtherNode);
@@ -444,6 +462,12 @@ void tmplput_MAIL_SUMM_DATE_BRIEF(StrBuf *Target, WCTemplputParams *TP)
 	StrBufAppendBufPlain(Target, datebuf, -1, 0);
 }
 
+void tmplput_MAIL_SUMM_EUID(StrBuf *Target, WCTemplputParams *TP)
+{
+	message_summary *Msg = (message_summary*) CTX;
+	StrBufAppendTemplate(Target, TP, Msg->euid, 0);
+}
+
 void tmplput_MAIL_SUMM_DATE_FULL(StrBuf *Target, WCTemplputParams *TP)
 {
 	char datebuf[64];
@@ -463,16 +487,19 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset
 {
 	const StrBuf *TemplateMime;
 
-	Mime->Data = NewStrBufPlain(NULL, Mime->length);
+	if (Mime->Data == NULL) 
+		Mime->Data = NewStrBufPlain(NULL, Mime->length);
+	else 
+		FlushStrBuf(Mime->Data);
 	read_message(Mime->Data, HKEY("view_submessage"), Mime->msgnum, Mime->PartNum, &TemplateMime);
 /*
 	if ( (!IsEmptyStr(mime_submessages)) && (!section[0]) ) {
 		for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
 			extract_token(buf, mime_submessages, i, '|', sizeof buf);
 			/ ** use printable_view to suppress buttons * /
-			wprintf("<blockquote>");
+			wc_printf("<blockquote>");
 			read_message(Mime->msgnum, 1, ChrPtr(Mime->Section));
-			wprintf("</blockquote>");
+			wc_printf("</blockquote>");
 		}
 	}
 */
@@ -481,22 +508,23 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset
 void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
 	wcsession *WCC = WC;
-	MimeLoadData(Mime);
+	if (StrLength(Mime->Data) == 0)
+		MimeLoadData(Mime);
 	if (StrLength(Mime->Data) > 0) {
 		StrBuf *Buf;
 		Buf = NewStrBuf();
 		/** If it's my vCard I can edit it */
-		if (	(!strcasecmp(ChrPtr(WCC->wc_roomname), USERCONFIGROOM))
-			|| (!strcasecmp(&(ChrPtr(WCC->wc_roomname)[11]), USERCONFIGROOM))
-			|| (WC->wc_view == VIEW_ADDRESSBOOK)
+		if (	(!strcasecmp(ChrPtr(WCC->CurRoom.name), USERCONFIGROOM))
+			|| (!strcasecmp(&(ChrPtr(WCC->CurRoom.name)[11]), USERCONFIGROOM))
+			|| (WC->CurRoom.view == VIEW_ADDRESSBOOK)
 			) {
-			StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
+			StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
 				Mime->msgnum, ChrPtr(Mime->PartNum));
 			StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
 		}
 
 		/* In all cases, display the full card */
-		display_vcard(Buf, Mime->Data, 0, 1, NULL, Mime->msgnum);
+		display_vcard(Buf, Mime, 0, 1, NULL, -1);
 		FreeStrBuf(&Mime->Data);
 		Mime->Data = Buf;
 	}
@@ -505,7 +533,8 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
 
 void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
-	MimeLoadData(Mime);
+	if (StrLength(Mime->Data) == 0)
+		MimeLoadData(Mime);
 	if (StrLength(Mime->Data) > 0) {
 		struct vnote *v;
 		StrBuf *Buf;
@@ -527,10 +556,13 @@ void render_MIME_VNote(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
 			vnote_free(v);
 			Mime->Data = Buf;
 		}
-		else
-			Mime->Data = NewStrBuf();
+		else {
+			if (Mime->Data == NULL)
+				Mime->Data = NewStrBuf();
+			else
+				FlushStrBuf(Mime->Data);
+		}
 	}
-
 }
 
 void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
@@ -547,6 +579,7 @@ void render_MIME_ICS(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCha
 
 void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
+	const char *Ptr = NULL;
 	wc_mime_attachment *Mime;
 	StrBuf *Buf;
 	
@@ -556,17 +589,17 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
 	Buf = NewStrBuf();
 
 	Mime->Name = NewStrBuf();
-	StrBufExtract_token(Buf, HdrLine, 0, '|');
+	StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|');
 	StrBuf_RFC822_to_Utf8(Mime->Name, Buf, WC->DefaultCharset, FoundCharset);
 	StrBufTrim(Mime->Name);
 
-	StrBufExtract_token(Buf, HdrLine, 1, '|');
+	StrBufExtract_NextToken(Buf, HdrLine, &Ptr, '|');
 	Mime->FileName = NewStrBuf();
 	StrBuf_RFC822_to_Utf8(Mime->FileName, Buf, WC->DefaultCharset, FoundCharset);
 	StrBufTrim(Mime->FileName);
 
 	Mime->PartNum = NewStrBuf();
-	StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|');
+	StrBufExtract_NextToken(Mime->PartNum, HdrLine, &Ptr, '|');
 	StrBufTrim(Mime->PartNum);
 	if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) 
 		Mime->level = 2;
@@ -574,18 +607,24 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
 		Mime->level = 1;
 
 	Mime->Disposition = NewStrBuf();
-	StrBufExtract_token(Mime->Disposition, HdrLine, 3, '|');
+	StrBufExtract_NextToken(Mime->Disposition, HdrLine, &Ptr, '|');
 
 	Mime->ContentType = NewStrBuf();
-	StrBufExtract_token(Mime->ContentType, HdrLine, 4, '|');
+	StrBufExtract_NextToken(Mime->ContentType, HdrLine, &Ptr, '|');
 	StrBufTrim(Mime->ContentType);
 	StrBufLowerCase(Mime->ContentType);
-
 	if (!strcmp(ChrPtr(Mime->ContentType), "application/octet-stream")) {
 		StrBufPlain(Mime->ContentType, 
 			    GuessMimeByFilename(SKEY(Mime->FileName)), -1);
 	}
-	Mime->length = StrBufExtract_int(HdrLine, 5, '|');
+
+	Mime->length = StrBufExtractNext_int(HdrLine, &Ptr, '|');
+
+	StrBufSkip_NTokenS(HdrLine, &Ptr, '|', 1);  /* cbid?? */
+
+	Mime->Charset = NewStrBuf();
+	StrBufExtract_NextToken(Mime->Charset, HdrLine, &Ptr, '|');
+
 
 	if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) {
 		StrBufAppendBuf(Mime->FileName, Mime->Name, 0);
@@ -674,7 +713,10 @@ int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
 
 void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
-	Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
+	if (Msg->MsgBody->Data == NULL)
+		Msg->MsgBody->Data = NewStrBufPlain(NULL, SIZ);
+	else
+		FlushStrBuf(Msg->MsgBody->Data);
 }
 
 void examine_msg4_partnum(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
@@ -798,6 +840,27 @@ void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 	FreeStrBuf(&Buf);
 }
 
+void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
+{
+	const StrBuf *Mime;
+        long msgnum;
+	StrBuf *Buf;
+
+	/* Insert the existing content of the wiki page into the editor.  But we only want
+	 * to do this the first time -- if the user is uploading an attachment we don't want
+	 * to do it again.
+	 */
+	if (!havebstr("attach_button")) {
+		msgnum = locate_message_by_uid(BSTR("page"));
+		if (msgnum >= 0L) {
+			Buf = NewStrBuf();
+			read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime);
+			StrBufAppendTemplate(Target, TP, Buf, 1);
+			FreeStrBuf(&Buf);
+		}
+	}
+}
+
 void tmplput_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
 {
 	message_summary *Msg = (message_summary*) CTX;
@@ -816,7 +879,6 @@ void render_MAIL_variformat(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 
 void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset)
 {
-	StrBuf *cs = NULL;
 	const char *ptr, *pte;
 	const char *BufPtr = NULL;
 	StrBuf *Line;
@@ -824,12 +886,13 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 	StrBuf *Line2;
 	StrBuf *Target;
 
-	int ConvertIt = 1;
 	int bn = 0;
 	int bq = 0;
 	int i;
 	long len;
 #ifdef HAVE_ICONV
+	StrBuf *cs = NULL;
+	int ConvertIt = 1;
 	iconv_t ic = (iconv_t)(-1) ;
 #endif
 
@@ -899,11 +962,11 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
 				StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
 			for (i = bq; i < bn; i++)				
 				StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
-
+#ifdef HAVE_ICONV
 			if (ConvertIt) {
 				StrBufConvert(Line, Line1, &ic);
 			}
-
+#endif
 			StrBufAppendBufPlain(Target, HKEY("<tt>"), 0);
 			UrlizeText(Line1, Line, Line2);
 
@@ -946,7 +1009,7 @@ void render_MAIL_html(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCh
 
 	/* HTML is fun, but we've got to strip it first */
 	output_html(ChrPtr(Mime->Charset), 
-		    (WC->wc_view == VIEW_WIKI ? 1 : 0), 
+		    (WC->CurRoom.view == VIEW_WIKI ? 1 : 0), 
 		    Mime->msgnum,
 		    Mime->Data, Buf);
 	FreeStrBuf(&Mime->Data);
@@ -1046,8 +1109,9 @@ void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP)
 	wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
 	wc_mime_attachment *att;
 	
-	if ( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
-	     (!strcasecmp(ChrPtr(mime->Disposition), "attachment")) ) 
+	if (( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
+	      (!strcasecmp(ChrPtr(mime->Disposition), "attachment"))) && 
+	    (strcasecmp(ChrPtr(mime->ContentType), "application/ms-tnef")!=0))
 	{
  		
  		int n;
@@ -1074,98 +1138,6 @@ void tmplput_MIME_Length(StrBuf *Target, WCTemplputParams *TP)
 	StrBufAppendPrintf(Target, "%ld", mime->length);
 }
 
-/* startmsg is an index within the message list.
- * starting_from is the Citadel message number to be supplied to a "MSGS GT" operation
- */
-long DrawMessageDropdown(StrBuf *Selector, long maxmsgs, long startmsg, int nMessages, long starting_from)
-{
-	StrBuf *TmpBuf;
-	wcsession *WCC = WC;
-	void *vMsg;
-	int lo, hi;
-	long ret;
-	long hklen;
-	const char *key;
-	int done = 0;
-	int nItems;
-	HashPos *At;
-	long vector[16];
-	WCTemplputParams SubTP;
-
-	memset(&SubTP, 0, sizeof(WCTemplputParams));
-	SubTP.Filter.ContextType = CTX_LONGVECTOR;
-	SubTP.Context = &vector;
-	TmpBuf = NewStrBufPlain(NULL, SIZ);
-	At = GetNewHashPos(WCC->summ, nMessages);
-	nItems = GetCount(WCC->summ);
-	ret = nMessages;
-	vector[0] = 7;
-	vector[2] = 1;
-	vector[1] = startmsg;
-	vector[3] = 0;
-	vector[7] = starting_from;
-
-	while (!done) {
-		vector[3] = abs(nMessages);
-		lo = GetHashPosCounter(At);
-		if (nMessages > 0) {
-			if (lo + nMessages >= nItems) {
-				hi = nItems - 1;
-				vector[3] = nItems - lo;
-				if (startmsg == lo) 
-					ret = vector[3];
-			}
-			else {
-				hi = lo + nMessages - 1;
-			}
-		} else {
-			if (lo + nMessages < -1) {
-				hi = 0;
-			}
-			else {
-				if ((lo % abs(nMessages)) != 0) {
-					int offset = (lo % abs(nMessages) *
-						      (nMessages / abs(nMessages)));
-					hi = lo + offset;
-					vector[3] = abs(offset);
-					if (startmsg == lo)
-						 ret = offset;
-				}
-				else
-					hi = lo + nMessages;
-			}
-		}
-		done = !GetNextHashPos(WCC->summ, At, &hklen, &key, &vMsg);
-		
-		/*
-		 * Bump these because although we're thinking in zero base, the user
-		 * is a drooling idiot and is thinking in one base.
-		 */
-		vector[4] = lo + 1;
-		vector[5] = hi + 1;
-		vector[6] = lo;
-		FlushStrBuf(TmpBuf);
-		dbg_print_longvector(vector);
-		DoTemplate(HKEY("select_messageindex"), TmpBuf, &SubTP);
-		StrBufAppendBuf(Selector, TmpBuf, 0);
-	}
-	vector[6] = 0;
-	FlushStrBuf(TmpBuf);
-	if (maxmsgs == 9999999) {
-		vector[1] = 1;
-		ret = maxmsgs;
-	}
-	else
-		vector[1] = 0;		
-	vector[2] = 0;
-	dbg_print_longvector(vector);
-	DoTemplate(HKEY("select_messageindex_all"), TmpBuf, &SubTP);
-	StrBufAppendBuf(Selector, TmpBuf, 0);
-	FreeStrBuf(&TmpBuf);
-	DeleteHashPos(&At);
-	return ret;
-}
-
 HashList *iterate_get_registered_Attachments(StrBuf *Target, WCTemplputParams *TP)
 {
 	return WC->attachments;
@@ -1191,6 +1163,11 @@ void servcmd_readgt(char *buf, long bufsize)
 	snprintf(buf, bufsize, "MSGS GT|%s", bstr("gt"));
 }
 
+void servcmd_readlt(char *buf, long bufsize)
+{
+	snprintf(buf, bufsize, "MSGS LT|%s", bstr("lt"));
+}
+
 void servcmd_readnew(char *buf, long bufsize)
 {
 	snprintf(buf, bufsize, "MSGS NEW");
@@ -1202,19 +1179,77 @@ void servcmd_readold(char *buf, long bufsize)
 }
 
 
+/* DO NOT REORDER OR REMOVE ANY OF THESE */
 readloop_struct rlid[] = {
-	{ {HKEY("do_search")}, servcmd_do_search},
-	{ {HKEY("headers")},   servcmd_headers},
-	{ {HKEY("readfwd")},   servcmd_readfwd},
-	{ {HKEY("readnew")},   servcmd_readnew},
-	{ {HKEY("readold")},   servcmd_readold},
-	{ {HKEY("readgt")},    servcmd_readgt}
+	{ {HKEY("do_search")},	servcmd_do_search	},
+	{ {HKEY("headers")},	servcmd_headers		},
+	{ {HKEY("readfwd")},	servcmd_readfwd		},
+	{ {HKEY("readnew")},	servcmd_readnew		},
+	{ {HKEY("readold")},	servcmd_readold		},
+	{ {HKEY("readgt")},	servcmd_readgt		},
+	{ {HKEY("readlt")},	servcmd_readlt		}
 };
 
+
+int ParseMessageListHeaders_Detail(StrBuf *Line, 
+				   const char **pos, 
+				   message_summary *Msg, 
+				   StrBuf *ConversionBuffer)
+{
+	wcsession *WCC = WC;
+
+	Msg->from = NewStrBufPlain(NULL, StrLength(Line));
+	StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
+	if (StrLength(ConversionBuffer) != 0) {
+		/* Handle senders with RFC2047 encoding */
+		StrBuf_RFC822_to_Utf8(Msg->from, ConversionBuffer, WCC->DefaultCharset, NULL);
+	}
+			
+	/* node name */
+	StrBufExtract_NextToken(ConversionBuffer, Line, pos, '|');
+	if ((StrLength(ConversionBuffer) !=0 ) &&
+		    ( ((WCC->CurRoom.QRFlags & QR_NETWORK)
+	       || ((strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_nodename))
+		    && (strcasecmp(ChrPtr(ConversionBuffer), ChrPtr(WCC->serv_info->serv_fqdn))))))))
+	{
+		StrBufAppendBufPlain(Msg->from, HKEY(" @ "), 0);
+		StrBufAppendBuf(Msg->from, ConversionBuffer, 0);
+	}
+
+	/* Internet address (not used)
+	 *	StrBufExtract_token(Msg->inetaddr, Line, 4, '|');
+	 */
+	StrBufSkip_NTokenS(Line, pos, '|', 1);
+	Msg->subj = NewStrBufPlain(NULL, StrLength(Line));
+
+	FlushStrBuf(ConversionBuffer);
+	/* we assume the subject is the last parameter inside of the list; 
+	 * thus we don't use the tokenizer to fetch it, since it will hick up 
+	 * on tokenizer chars inside of the subjects
+	StrBufExtract_NextToken(ConversionBuffer,  Line, pos, '|');
+	*/
+	if (*pos != StrBufNOTNULL) {
+		StrBufPlain(ConversionBuffer, *pos, 
+			    StrLength(Line) - (*pos - ChrPtr(Line)));
+		*pos = StrBufNOTNULL;
+		if ((StrLength(ConversionBuffer) > 0) &&
+		    (*(ChrPtr(ConversionBuffer) + 
+		       StrLength(ConversionBuffer) - 1) == '|'))
+			StrBufCutRight(ConversionBuffer, 1);
+	}
+
+	if (StrLength(ConversionBuffer) == 0)
+		StrBufAppendBufPlain(Msg->subj, _("(no subject)"), -1,0);
+	else {
+		StrBuf_RFC822_to_Utf8(Msg->subj, ConversionBuffer, WCC->DefaultCharset, NULL);
+	}
+
+	return 1;
+}
+
 /* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
 void new_summary_view(void) {
 	DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
-	DoTemplate(HKEY("trailing"),NULL,&NoCtx);
 }
 
 
@@ -1251,7 +1286,9 @@ int mailview_RenderView_or_Tail(SharedMessageStatus *Stat,
 {
 	WCTemplputParams SubTP;
 
-	DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
+	if (WC->is_ajax)
+		DoTemplate(HKEY("mailsummary_json"),NULL, &SubTP);
+	
 	return 0;
 }
 
@@ -1259,175 +1296,15 @@ int mailview_Cleanup(void **ViewSpecific)
 {
 	/* Note: wDumpContent() will output one additional </div> tag. */
 	/* We ought to move this out into template */
-	if (WC->is_ajax) 
+	if (WC->is_ajax)
 		end_burst();
 	else
 		wDumpContent(1);
-	return 0;
-}
-
-
-
-typedef struct _bbsview_stuct {
-	StrBuf *BBViewToolBar;
-	StrBuf *MessageDropdown;
-	long *displayed_msgs;
-	int a;
-}bbsview_struct;
-
-int bbsview_GetParamsGetServerCall(SharedMessageStatus *Stat, 
-				   void **ViewSpecific, 
-				   long oper, 
-				   char *cmd, 
-				   long len)
-{
-	bbsview_struct *VS;
-
-	VS = (bbsview_struct*) malloc(sizeof(bbsview_struct));
-	memset(VS, 0, sizeof(bbsview_struct));
-	*ViewSpecific = (void*)VS;
-	Stat->defaultsortorder = 1;
-	Stat->startmsg = -1;
-	Stat->sortit = 1;
-	
-	rlid[oper].cmd(cmd, len);
-	
-	if (havebstr("maxmsgs"))
-		Stat->maxmsgs = ibstr("maxmsgs");
-	if (Stat->maxmsgs == 0) Stat->maxmsgs = DEFAULT_MAXMSGS;
-	
-	if (havebstr("startmsg")) {
-		Stat->startmsg = lbstr("startmsg");
-	}
-	if (lbstr("SortOrder") == 2) {
-		Stat->reverse = 1;
-		Stat->num_displayed = -DEFAULT_MAXMSGS;
-	}
-	else {
-		Stat->reverse = 0;
-		Stat->num_displayed = DEFAULT_MAXMSGS;
-	}
-
-	return 200;
-}
-
-int bbsview_PrintViewHeader(SharedMessageStatus *Stat, void **ViewSpecific)
-{
-	bbsview_struct *VS;
-	WCTemplputParams SubTP;
-
-	VS = (bbsview_struct*)*ViewSpecific;
-
-	VS->BBViewToolBar = NewStrBufPlain(NULL, SIZ);
-	VS->MessageDropdown = NewStrBufPlain(NULL, SIZ);
 
-	/*** startmsg->maxmsgs = **/DrawMessageDropdown(VS->MessageDropdown, 
-							Stat->maxmsgs, 
-							Stat->startmsg,
-							Stat->num_displayed, 
-							Stat->lowest_found-1);
-	if (Stat->num_displayed < 0) {
-		Stat->startmsg += Stat->maxmsgs;
-		if (Stat->num_displayed != Stat->maxmsgs)				
-			Stat->maxmsgs = abs(Stat->maxmsgs) + 1;
-		else
-			Stat->maxmsgs = abs(Stat->maxmsgs);
-
-	}
-	if (Stat->nummsgs > 0) {
-		memset(&SubTP, 0, sizeof(WCTemplputParams));
-		SubTP.Filter.ContextType = CTX_STRBUF;
-		SubTP.Context = VS->MessageDropdown;
-		DoTemplate(HKEY("msg_listselector_top"), VS->BBViewToolBar, &SubTP);
-		StrBufAppendBuf(WC->WBuf, VS->BBViewToolBar, 0);
-		FlushStrBuf(VS->BBViewToolBar);
-	}
-	return 200;
-}
-
-int bbsview_LoadMsgFromServer(SharedMessageStatus *Stat, 
-			      void **ViewSpecific, 
-			      message_summary* Msg, 
-			      int is_new, 
-			      int i)
-{
-	bbsview_struct *VS;
-
-	VS = (bbsview_struct*)*ViewSpecific;
-	if (VS->displayed_msgs == NULL) {
-		VS->displayed_msgs = malloc(sizeof(long) *
-					    ((Stat->maxmsgs < Stat->nummsgs) ? 
-					     Stat->maxmsgs + 1 : 
-					     Stat->nummsgs + 1));
-	}
-	if ((i >= Stat->startmsg) && (i < Stat->startmsg + Stat->maxmsgs)) {
-		VS->displayed_msgs[Stat->num_displayed] = Msg->msgnum;
-		Stat->num_displayed++;
-	}
-	return 200;
-}
-
-
-int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat, 
-			       void **ViewSpecific, 
-			       long oper)
-{
-	wcsession *WCC = WC;
-	bbsview_struct *VS;
-	WCTemplputParams SubTP;
-	const StrBuf *Mime;
-
-	VS = (bbsview_struct*)*ViewSpecific;
-	if (Stat->nummsgs == 0) {
-		wprintf("<div class=\"nomsgs\"><br><em>");
-		switch (oper) {
-		case readnew:
-			wprintf(_("No new messages."));
-			break;
-		case readold:
-			wprintf(_("No old messages."));
-			break;
-		default:
-			wprintf(_("No messages here."));
-		}
-		wprintf("</em><br></div>\n");
-	}
-	else 
-	{
-		if (VS->displayed_msgs != NULL) {
-			/* if we do a split bbview in the future, begin messages div here */
-			int a;/// todo	
-			for (a=0; a < Stat->num_displayed; ++a) {
-				read_message(WCC->WBuf, HKEY("view_message"), VS->displayed_msgs[a], NULL, &Mime);
-			}
-			
-			/* if we do a split bbview in the future, end messages div here */
-			
-			free(VS->displayed_msgs);
-			VS->displayed_msgs = NULL;
-		}
-		memset(&SubTP, 0, sizeof(WCTemplputParams));
-		SubTP.Filter.ContextType = CTX_STRBUF;
-		SubTP.Context = VS->MessageDropdown;
-		DoTemplate(HKEY("msg_listselector_bottom"), VS->BBViewToolBar, &SubTP);
-		StrBufAppendBuf(WCC->WBuf, VS->BBViewToolBar, 0);
-	}
 	return 0;
-
 }
 
 
-int bbsview_Cleanup(void **ViewSpecific)
-{
-	bbsview_struct *VS;
-
-	VS = (bbsview_struct*)*ViewSpecific;
-	end_burst();
-	FreeStrBuf(&VS->BBViewToolBar);
-	FreeStrBuf(&VS->MessageDropdown);
-	free(VS);
-	return 0;
-}
 
 void 
 InitModule_MSGRENDERERS
@@ -1437,18 +1314,11 @@ InitModule_MSGRENDERERS
 		VIEW_MAILBOX,
 		mailview_GetParamsGetServerCall,
 		NULL, /// TODO: is this right?
+		ParseMessageListHeaders_Detail,
 		NULL, //// ""
 		mailview_RenderView_or_Tail,
 		mailview_Cleanup);
 
-	RegisterReadLoopHandlerset(
-		VIEW_BBS,
-		bbsview_GetParamsGetServerCall,
-		bbsview_PrintViewHeader,
-		bbsview_LoadMsgFromServer,
-		bbsview_RenderView_or_Tail,
-		bbsview_Cleanup);
-
 	RegisterSortFunc(HKEY("date"), 
 			 NULL, 0,
 			 summcmp_date,
@@ -1468,30 +1338,32 @@ InitModule_MSGRENDERERS
 			 groupchange_sender,
 			 CTX_MAILSUM);
 
-	RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, CTX_NONE);
+	RegisterNamespace("SUMM:COUNT", 0, 0, tmplput_SUMM_COUNT, NULL, CTX_NONE);
 	/* iterate over all known mails in WC->summ */
 	RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All,
 			 NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG);
 
-	RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:DATENO",  0, 0, tmplput_MAIL_SUMM_DATE_NO,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:N",       0, 0, tmplput_MAIL_SUMM_N,        CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:FROM",    0, 2, tmplput_MAIL_SUMM_FROM,     CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:TO",      0, 2, tmplput_MAIL_SUMM_TO,       CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  CTX_MAILSUM);
-	RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  CTX_NONE);
-	RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY,  CTX_NONE);
+	RegisterNamespace("MAIL:SUMM:EUID", 0, 1, tmplput_MAIL_SUMM_EUID, NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:DATEBRIEF", 0, 0, tmplput_MAIL_SUMM_DATE_BRIEF, NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:DATEFULL", 0, 0, tmplput_MAIL_SUMM_DATE_FULL, NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:DATENO",  0, 0, tmplput_MAIL_SUMM_DATE_NO,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:N",       0, 0, tmplput_MAIL_SUMM_N,        NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:FROM",    0, 2, tmplput_MAIL_SUMM_FROM,     NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:TO",      0, 2, tmplput_MAIL_SUMM_TO,       NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:SUBJECT", 0, 4, tmplput_MAIL_SUMM_SUBJECT,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:NTATACH", 0, 0, tmplput_MAIL_SUMM_NATTACH,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:CCCC", 0, 2, tmplput_MAIL_SUMM_CCCC, NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:H_NODE", 0, 2, tmplput_MAIL_SUMM_H_NODE,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:ALLRCPT", 0, 2, tmplput_MAIL_SUMM_ALLRCPT,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA, NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  NULL, CTX_MAILSUM);
+	RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  NULL, CTX_NONE);
+	RegisterNamespace("MAIL:EDITTEXT", 1, 2, tmplput_EDIT_MAIL_BODY,  NULL, CTX_NONE);
+	RegisterNamespace("MAIL:EDITWIKI", 1, 2, tmplput_EDIT_WIKI_BODY,  NULL, CTX_NONE);
 	RegisterConditional(HKEY("COND:MAIL:SUMM:RFCA"), 0, Conditional_MAIL_SUMM_RFCA,  CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:SUMM:CCCC"), 0, Conditional_MAIL_SUMM_CCCC,  CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:SUMM:UNREAD"), 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
@@ -1517,34 +1389,36 @@ InitModule_MSGRENDERERS
 			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 
 	/* Parts of a mime attachent */
-	RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, CTX_MIME_ATACH);
-	RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:FILENAME", 0, 2, tmplput_MIME_FileName, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:PARTNUM", 0, 2, tmplput_MIME_PartNum, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:MSGNUM", 0, 2, tmplput_MIME_MsgNum, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:DISPOSITION", 0, 2, tmplput_MIME_Disposition, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:CONTENTTYPE", 0, 2, tmplput_MIME_ContentType, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:CHARSET", 0, 2, tmplput_MIME_Charset, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:LENGTH", 0, 2, tmplput_MIME_Length, NULL, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:DATA", 0, 2, tmplput_MIME_Data, NULL, CTX_MIME_ATACH);
 	/* load the actual attachment into WC->attachments; no output!!! */
-	RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, CTX_MIME_ATACH);
+	RegisterNamespace("MAIL:MIME:LOADDATA", 0, 0, tmplput_MIME_LoadData, NULL, CTX_MIME_ATACH);
 
 	/* iterate the WC->attachments; use the above tokens for their contents */
 	RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, 
 			 NULL, NULL, CTX_MIME_ATACH, CTX_NONE, IT_NOFLAG);
 
 	/* mime renderers translate an attachment into webcit viewable html text */
-	RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL);
-	RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote);
-	RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard);
-	RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard);
-	RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS);
-	RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS);
-	RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat);
-	RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain);
-	RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain);
-	RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html);
-	RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN);
+	RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 0, 150);
+	RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote, 1, 300);
+	RegisterMimeRenderer(HKEY("text/x-vcard"), render_MIME_VCard, 1, 201);
+	RegisterMimeRenderer(HKEY("text/vcard"), render_MIME_VCard, 1, 200);
+	RegisterMimeRenderer(HKEY("text/calendar"), render_MIME_ICS, 1, 501);
+	RegisterMimeRenderer(HKEY("application/ics"), render_MIME_ICS, 1, 500);
+	RegisterMimeRenderer(HKEY("text/x-citadel-variformat"), render_MAIL_variformat, 1, 2);
+	RegisterMimeRenderer(HKEY("text/plain"), render_MAIL_text_plain, 1, 3);
+	RegisterMimeRenderer(HKEY("text"), render_MAIL_text_plain, 1, 1);
+	RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html, 1, 100);
+	RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN, 0, 0);
+	/* and finalize the anouncement to the server... */
+	CreateMimeStr();
 
 	/* these headers are citserver replies to MSG4 and friends. one evaluator for each */
 	RegisterMsgHdr(HKEY("nhdr"), examine_nhdr, 0);