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

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 4be851de3..3ba80c97f 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -362,17 +362,26 @@ void tmplput_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
 	}
 	StrBufAppendTemplate(Target, TP, Msg->subj, 0);
 }
-int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP)
-{
+
+/*
+ * Conditional returns true if the message has a Subject and it is nonzero in length
+ */
+int Conditional_MAIL_SUMM_SUBJECT(StrBuf *Target, WCTemplputParams *TP) {
 	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	return StrLength(Msg->subj) > 0;
+}
 
 
-	return StrLength(Msg->subj) > 0;
+/*
+ * Conditional returns true if the message originated on the local system
+ */
+int Conditional_MAIL_LOCAL(StrBuf *Target, WCTemplputParams *TP) {
+	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	return (Msg->is_local ? 1 : 0);
 }
 
 
-void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
-{
+void examine_msgn(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset) {
 	wcsession *WCC = WC;
 	long Offset = 0;
 	const char *pOffset;
@@ -492,6 +501,8 @@ void examine_room(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 		Msg->Room = NewStrBufDup(HdrLine);		
 	}
 }
+
+
 void tmplput_MAIL_SUMM_ORGROOM(StrBuf *Target, WCTemplputParams *TP)
 {
 	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
@@ -504,6 +515,14 @@ void examine_rfca(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	FreeStrBuf(&Msg->Rfca);
 	Msg->Rfca = NewStrBufDup(HdrLine);
 }
+
+
+void examine_locl(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
+{
+	Msg->is_local = 1;
+}
+
+
 void tmplput_MAIL_SUMM_RFCA(StrBuf *Target, WCTemplputParams *TP)
 {
 	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
@@ -1357,13 +1376,14 @@ const char* fieldMnemonics[] = {
 	"nhdr", /* % -> eHeaderOnly   */
 	"type", /* % -> eFormatType   */
 	"part", /* % -> eMessagePart  */
-	"suff", /* % -> eSubFolder    */
-	"pref"  /* % -> ePevious      */
+	"suff", /*      eSubFolder    */
+	"pref", /*      ePrefix       */
+	"locl"	/*      eIsLocal      */
 };
 HashList *msgKeyLookup = NULL;
 
-int GetFieldFromMnemonic(eMessageField *f, const char* c)
-{
+
+int GetFieldFromMnemonic(eMessageField *f, const char *c) {
 	void *v = NULL;
 	if (GetHash(msgKeyLookup, c, 4, &v)) {
 		*f = (eMessageField) v;
@@ -1372,8 +1392,8 @@ int GetFieldFromMnemonic(eMessageField *f, const char* c)
 	return 0;
 }
 
-void FillMsgKeyLookupTable(void)
-{
+
+void FillMsgKeyLookupTable(void) {
 	long i = 0;
 
 	msgKeyLookup = NewHash (1, FourHash);
@@ -1387,7 +1407,6 @@ void FillMsgKeyLookupTable(void)
 }
 
 
-
 void 
 InitModule_MSGRENDERERS
 (void)
@@ -1415,9 +1434,9 @@ InitModule_MSGRENDERERS
 			 CTX_MAILSUM);
 
 	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);
+	RegisterIterator("MAIL:SUMM:MSGS", 0, NULL, iterate_get_mailsumm_All, NULL,NULL, CTX_MAILSUM, CTX_NONE, IT_NOFLAG);
 
 	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);
@@ -1446,22 +1465,19 @@ InitModule_MSGRENDERERS
 	RegisterConditional("COND:MAIL:SUMM:UNREAD", 0, Conditional_MAIL_SUMM_UNREAD, 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);	
-	RegisterConditional("COND:MAIL:SUBJ", 0, Conditional_MAIL_SUMM_SUBJ, CTX_MAILSUM);	
+	RegisterConditional("COND:MAIL:TO", 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:SUBJ", 0, Conditional_MAIL_SUMM_SUBJ, CTX_MAILSUM);
+	RegisterConditional("COND:MAIL:LOCAL", 0, Conditional_MAIL_LOCAL, CTX_MAILSUM);
 
 	/* do we have mimetypes to iterate over? */
 	RegisterConditional("COND:MAIL:MIME:ATTACH", 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 0, Conditional_MAIL_MIME_SUBMESSAGES, CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:MIME:ATTACH:LINKS", 0, Conditional_MAIL_MIME_ATTACHLINKS, CTX_MAILSUM);
 	RegisterConditional("COND:MAIL:MIME:ATTACH:ATT", 0, Conditional_MAIL_MIME_ATTACH, CTX_MAILSUM);
-	RegisterIterator("MAIL:MIME:ATTACH", 0, NULL, iterate_get_mime_All, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
-	RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
-	RegisterIterator("MAIL:MIME:ATTACH:LINKS", 0, NULL, iterate_get_mime_AttachLinks, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
-	RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, 
-			 NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
+	RegisterIterator("MAIL:MIME:ATTACH", 0, NULL, iterate_get_mime_All, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
+	RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
+	RegisterIterator("MAIL:MIME:ATTACH:LINKS", 0, NULL, iterate_get_mime_AttachLinks, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
+	RegisterIterator("MAIL:MIME:ATTACH:ATT", 0, NULL, iterate_get_mime_Attachments, NULL, NULL, CTX_MIME_ATACH, CTX_MAILSUM, IT_NOFLAG);
 
 	/* Parts of a mime attachent */
 	RegisterNamespace("MAIL:MIME:NAME", 0, 2, tmplput_MIME_Name, NULL, CTX_MIME_ATACH);
@@ -1473,13 +1489,12 @@ InitModule_MSGRENDERERS
 	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, 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);
-
+	RegisterIterator("MSG:ATTACHNAMES", 0, NULL, iterate_get_registered_Attachments, NULL, NULL, CTX_MIME_ATACH, CTX_NONE, IT_NOFLAG);
 	RegisterNamespace("MSG:NATTACH", 0, 0, get_registered_Attachments_Count,  NULL, CTX_NONE);
 
 	/* mime renderers translate an attachment into webcit viewable html text */
@@ -1511,8 +1526,10 @@ InitModule_MSGRENDERERS
 	RegisterMsgHdr(HKEY("nvto"), examine_nvto, 0);
 	RegisterMsgHdr(HKEY("time"), examine_time, 0);
 	RegisterMsgHdr(HKEY("part"), examine_mime_part, 0);
+	RegisterMsgHdr(HKEY("locl"), examine_locl, 0);
 	RegisterMsgHdr(HKEY("text"), examine_text, 1);
-	/* these are the content-type headers we get infront of a message; put it into the same hash since it doesn't clash. */
+
+	/* these are the content-type headers we get in front of a message; put it into the same hash since it doesn't clash. */
 	RegisterMsgHdr(HKEY("X-Citadel-MSG4-Partnum"), examine_msg4_partnum, 0);
 	RegisterMsgHdr(HKEY("Content-type"), examine_content_type, 0);
 	RegisterMsgHdr(HKEY("Content-length"), examine_content_lengh, 0);