X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit%2Fmsg_renderers.c;h=4be851de3c68e5d7b385ba2877450bd4cb80dbf0;hp=d65d0d13bdd972a24268cd61c41c1b463adad73b;hb=0008163783f3a3b6605813f2db138903450f9ea7;hpb=c34c060023c0cec0e74be045818e6489e3c15d47

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index d65d0d13b..4be851de3 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -52,13 +52,10 @@ void DestroyMessageSummary(void *vMsg)
 	FreeStrBuf(&Msg->reply_references);
 	FreeStrBuf(&Msg->cccc);
 	FreeStrBuf(&Msg->ReplyTo);
-	FreeStrBuf(&Msg->hnod);
 	FreeStrBuf(&Msg->AllRcpt);
 	FreeStrBuf(&Msg->Room);
 	FreeStrBuf(&Msg->Rfca);
 	FreeStrBuf(&Msg->EnvTo);
-	FreeStrBuf(&Msg->OtherNode);
-
 	DeleteHash(&Msg->Attachments);	/* list of Attachments */
 	DeleteHash(&Msg->Submessages);
 	DeleteHash(&Msg->AttachLinks);
@@ -377,11 +374,17 @@ int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
 void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	wcsession *WCC = WC;
+	long Offset = 0;
+	const char *pOffset;
 
 	CheckConvertBufs(WCC);
 	FreeStrBuf(&Msg->reply_inreplyto);
 	Msg->reply_inreplyto = NewStrBufPlain(NULL, StrLength(HdrLine));
-	Msg->reply_inreplyto_hash = ThreadIdHash(HdrLine);
+	pOffset = strchr(ChrPtr(HdrLine), '/');
+	if (pOffset != NULL) {
+		Offset = pOffset - ChrPtr(HdrLine);
+	}
+	Msg->reply_inreplyto_hash = ThreadIdHashOffset(HdrLine, Offset);
 	StrBuf_RFC822_2_Utf8(Msg->reply_inreplyto, 
 			     HdrLine, 
 			     WCC->DefaultCharset,
@@ -404,11 +407,17 @@ int Conditional_MAIL_SUMM_UNREAD(StrBuf *Target, WCTemplputParams *TP)
 void examine_wefw(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	wcsession *WCC = WC;
+	long Offset = 0;
+	const char *pOffset;
 
 	CheckConvertBufs(WCC);
 	FreeStrBuf(&Msg->reply_references);
 	Msg->reply_references = NewStrBufPlain(NULL, StrLength(HdrLine));
-	Msg->reply_references_hash = ThreadIdHash(HdrLine);
+	pOffset = strchr(ChrPtr(HdrLine), '/');
+	if (pOffset != NULL) {
+		Offset = pOffset - ChrPtr(HdrLine);
+	}
+	Msg->reply_references_hash = ThreadIdHashOffset(HdrLine, Offset);
 	StrBuf_RFC822_2_Utf8(Msg->reply_references, 
 			     HdrLine, 
 			     WCC->DefaultCharset, 
@@ -516,29 +525,6 @@ int Conditional_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP)
 	return StrLength(Msg->ReplyTo) > 0;
 }
 
-void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-	wcsession *WCC = WC;
-
-	if ( (StrLength(HdrLine) > 0) &&
-	     ((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);
-		Msg->OtherNode = NewStrBufDup(HdrLine);
-	}
-}
-void tmplput_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-	StrBufAppendTemplate(Target, TP, Msg->OtherNode, 0);
-}
-int Conditional_MAIL_SUMM_OTHERNODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-	return StrLength(Msg->OtherNode) > 0;
-}
-
 void examine_nvto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	wcsession *WCC = WC;
@@ -805,34 +791,6 @@ void tmplput_MAIL_SUMM_NATTACH(StrBuf *Target, WCTemplputParams *TP)
 	StrBufAppendPrintf(Target, "%ld", GetCount(Msg->Attachments));
 }
 
-
-void examine_hnod(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
-	wcsession *WCC = WC;
-
-	CheckConvertBufs(WCC);
-	FreeStrBuf(&Msg->hnod);
-	Msg->hnod = NewStrBufPlain(NULL, StrLength(HdrLine));
-	StrBuf_RFC822_2_Utf8(Msg->hnod, 
-			     HdrLine, 
-			     WCC->DefaultCharset, 
-			     FoundCharset,
-			     WCC->ConvertBuf1,
-			     WCC->ConvertBuf2);
-}
-void tmplput_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-	StrBufAppendTemplate(Target, TP, Msg->hnod, 0);
-}
-int Conditional_MAIL_SUMM_H_NODE(StrBuf *Target, WCTemplputParams *TP)
-{
-	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
-	return StrLength(Msg->hnod) > 0;
-}
-
-
-
 void examine_text(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
 	if (Msg->MsgBody->Data == NULL)
@@ -1197,40 +1155,6 @@ void render_MAIL_html(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset
 	Mime->Data = Buf;
 }
 
-#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;
-
-	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);
-		}
-		mkd_cleanup(doc);
-	}
-}
-#endif
 
 void render_MAIL_UNKNOWN(StrBuf *Target, WCTemplputParams *TP, StrBuf *FoundCharset)
 {
@@ -1416,13 +1340,11 @@ const char* fieldMnemonics[] = {
 	"from", /* A -> eAuthor       */
 	"exti", /* E -> eXclusivID    */
 	"rfca", /* F -> erFc822Addr   */
-	"hnod", /* H -> eHumanNode    */
 	"msgn", /* I -> emessageId    */
 	"jrnl", /* J -> eJournal      */
 	"rep2", /* K -> eReplyTo      */
 	"list", /* L -> eListID       */
 	"text", /* M -> eMesageText   */
-	"node", /* N -> eNodeName     */
 	"room", /* O -> eOriginalRoom */
 	"path", /* P -> eMessagePath  */
 	"rcpt", /* R -> eRecipient    */
@@ -1509,11 +1431,9 @@ InitModule_MSGRENDERERS
 	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:REPLYTO", 0, 2, tmplput_MAIL_SUMM_REPLYTO, 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);
@@ -1524,8 +1444,6 @@ InitModule_MSGRENDERERS
 	RegisterConditional("COND:MAIL:SUMM:CCCC", 0, Conditional_MAIL_SUMM_CCCC,  CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:SUMM:REPLYTO", 0, Conditional_MAIL_SUMM_REPLYTO,  CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:SUMM:UNREAD", 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
-	RegisterConditional("COND:MAIL:SUMM:H_NODE", 0, Conditional_MAIL_SUMM_H_NODE, CTX_MAILSUM);
-	RegisterConditional("COND:MAIL:SUMM:OTHERNODE", 0, Conditional_MAIL_SUMM_OTHERNODE, CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:SUMM:SUBJECT", 0, Conditional_MAIL_SUMM_SUBJECT, CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:ANON", 0, Conditional_ANONYMOUS_MESSAGE, CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:TO", 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM);	
@@ -1573,10 +1491,8 @@ InitModule_MSGRENDERERS
 	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/x-markdown"), render_MAIL_text_plain, 1, 1);
 	RegisterMimeRenderer(HKEY("text/html"), render_MAIL_html, 1, 100);
-#ifdef HAVE_MARKDOWN
-	RegisterMimeRenderer(HKEY("text/x-markdown"), render_MAIL_markdown, 1, 30);
-#endif
 	RegisterMimeRenderer(HKEY(""), render_MAIL_UNKNOWN, 0, 0);
 
 	/* these headers are citserver replies to MSG4 and friends. one evaluator for each */
@@ -1589,10 +1505,8 @@ InitModule_MSGRENDERERS
 	RegisterMsgHdr(HKEY("wefw"), examine_wefw, 0);
 	RegisterMsgHdr(HKEY("cccc"), examine_cccc, 0);
 	RegisterMsgHdr(HKEY("rep2"), examine_replyto, 0);
-	RegisterMsgHdr(HKEY("hnod"), examine_hnod, 0);
 	RegisterMsgHdr(HKEY("room"), examine_room, 0);
 	RegisterMsgHdr(HKEY("rfca"), examine_rfca, 0);
-	RegisterMsgHdr(HKEY("node"), examine_node, 0);
 	RegisterMsgHdr(HKEY("rcpt"), examine_rcpt, 0);
 	RegisterMsgHdr(HKEY("nvto"), examine_nvto, 0);
 	RegisterMsgHdr(HKEY("time"), examine_time, 0);