From 50385b5001f4b2baaa7cd13d6b00e70fc0226ea0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Sat, 8 Nov 2008 09:50:13 +0000
Subject: [PATCH] * re-implement anonymous messages

---
 webcit/messages.c                 | 18 ++++++++++--------
 webcit/static/t/view_message.html |  8 +++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/webcit/messages.c b/webcit/messages.c
index baa2255d8..64b0c5189 100644
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -313,6 +313,12 @@ void examine_nhdr(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 	if (!strncasecmp(ChrPtr(HdrLine), "yes", 8))
 		Msg->nhdr = 1;
 }
+int Conditional_ANONYMOUS_MESSAGE(WCTemplateToken *Tokens, void *Context, int ContextType)
+{
+	message_summary *Msg = (message_summary*) Context;
+	return Msg->nhdr != 0;
+}
+
 
 void examine_type(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
@@ -1442,7 +1448,6 @@ void read_message(long msgnum, int printable_view, char *section) {
 	int num_attach_links = 0;
 //	char mime_submessages[256] = "";
 	char reply_references[1024] = "";
-	int nhdr = 0;
 	int i = 0;
 	int Done = 0;
 	int state=0;
@@ -1470,6 +1475,7 @@ void read_message(long msgnum, int printable_view, char *section) {
 	Token = NewStrBuf();
 	Msg = (message_summary *)malloc(sizeof(message_summary));
 	memset(Msg, 0, sizeof(message_summary));
+	Msg->msgnum = msgnum;
 	FoundCharset = NewStrBuf();
 	while ((StrBuf_ServGetln(Buf)>=0) && !Done) {
 		if ( (StrLength(Buf)==3) && 
@@ -1606,10 +1612,6 @@ void read_message(long msgnum, int printable_view, char *section) {
 			StrBufAppendBuf(Msg->reply_to, Msg->from, 0);
 		}
 	}
-///TODO: why this?
-	if (nhdr == 1) {
-		wprintf("****");
-	}
 	DoTemplate(HKEY("view_message"), NULL, Msg, CTX_MAILSUM);
 
 
@@ -3517,7 +3519,7 @@ void display_enter(void)
 			}
 		}
 		else if (buf[0] != '2') {	/** Any other error means that we cannot continue */
-			wprintf("<em>%s</em><br />\n", &buf[4]);
+			wprintf("<em>%s</em><br />\n", &buf[4]);/// -> important message
 			goto DONE;
 		}
 	}
@@ -3966,7 +3968,7 @@ InitModule_MSG
 	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:NATTACH", 0, 0, tmplput_MAIL_SUMM_NATTACH,  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);
@@ -3981,13 +3983,13 @@ InitModule_MSG
 	RegisterConditional(HKEY("COND:MAIL:SUMM:UNREAD"), 0, Conditional_MAIL_SUMM_UNREAD, CTX_MAILSUM);
 	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);
 
 	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH"), 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH:SUBMESSAGES"), 0, Conditional_MAIL_MIME_SUBMESSAGES, CTX_MAILSUM);
 	RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH:LINKS"), 0, Conditional_MAIL_MIME_ATTACHLINKS, CTX_MAILSUM);
 	RegisterConditional(HKEY("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);
 	RegisterIterator("MAIL:MIME:ATTACH:SUBMESSAGES", 0, NULL, iterate_get_mime_Submessages, 
diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index 9a43a3a20..16a2b22bf 100644
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -2,7 +2,9 @@
 onMouseOver=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="visible"
 onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden" >
 <div class="message_header"><span><?MAIL:SUMM:DATESTR></span>
-<?_("from ")><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> 
+<?_("from ")>
+<??("COND:MAIL:ANON",1)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a><??("X", 1)>
+<?!("COND:MAIL:ANON",2)>***<??("X", 2)>
 <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">
 
 <a href="display_enter?recp=<?MAIL:SUMM:FROM("U")>&references=<?MAIL:SUMM:INREPLYTO("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re:%%20", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
@@ -25,8 +27,8 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <div class="message_content"><div align="justify">
 <?MAIL:BODY>    
 </div>
-<?!("COND:MAIL:MIME:ATTACH:LINKS", 1)>
+<?!("COND:MAIL:MIME:ATTACH:LINKS", 2)>
 <?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_message_list_attach")>
-<?!("X", 1)>
+<?!("X", 2)>
 
 </div>
-- 
2.39.2