* just print "to" into messages if theres a recipient.
authorWilfried Göesgens <willi@citadel.org>
Mon, 2 Feb 2009 21:45:39 +0000 (21:45 +0000)
committerWilfried Göesgens <willi@citadel.org>
Mon, 2 Feb 2009 21:45:39 +0000 (21:45 +0000)
webcit/msg_renderers.c
webcit/static/t/view_message.html

index 7e19095487a8585cbfa0d27024017229a81e7dfd..0280df6a112307c21bdf14a28454881adc37c806 100644 (file)
@@ -398,6 +398,11 @@ void tmplput_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP)
        message_summary *Msg = (message_summary*) CTX;
        StrBufAppendTemplate(Target, TP, Msg->to, 0);
 }
+int Conditional_MAIL_SUMM_TO(StrBuf *Target, WCTemplputParams *TP) 
+{
+       message_summary *Msg = (message_summary*) CTX;
+       return StrLength(Msg->to) != 0;
+}
 void tmplput_MAIL_SUMM_ALLRCPT(StrBuf *Target, WCTemplputParams *TP)
 {
        message_summary *Msg = (message_summary*) CTX;
@@ -1137,7 +1142,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);
-       
+       RegisterConditional(HKEY("COND:MAIL:TO"), 0, Conditional_MAIL_SUMM_TO, CTX_MAILSUM);    
 
        /* do we have mimetypes to iterate over? */
        RegisterConditional(HKEY("COND:MAIL:MIME:ATTACH"), 0, Conditional_MAIL_MIME_ALL, CTX_MAILSUM);
index 94a3931e587dc5c5f333228f05d4e037822a9816..fd13a57a8b8dcd9c65322cc39431e042794440d4 100644 (file)
@@ -10,8 +10,8 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",3)> @ <?MAIL:SUMM:H_NODE><??("X",3)>
 <??("X", 1)>
  <?!("COND:MAIL:ANON", 4)>***<??("X", 4)>
- <?_("to")> <?MAIL:SUMM:TO("X")><br/>
- <?!("COND:MAIL:SUMM:CCCC", 5)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 5)>
+ <?!("COND:MAIL:TO", 5)><?_("to")> <?MAIL:SUMM:TO("X")><?!("X", 5)><br/>
+ <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
 
 
 
@@ -36,12 +36,12 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 </div>
 <div class="message_content"><div>
 <?MAIL:BODY>
-<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 6)>
+<?!("COND:MAIL:MIME:ATTACH:SUBMESSAGES", 7)>
 <?ITERATE("MAIL:MIME:ATTACH:SUBMESSAGES", "view_message_inline_attach")>
-<?!("X", 6)>
-<?!("COND:MAIL:MIME:ATTACH:LINKS", 7)>
-<?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_message_list_attach")>
 <?!("X", 7)>
+<?!("COND:MAIL:MIME:ATTACH:LINKS", 8)>
+<?ITERATE("MAIL:MIME:ATTACH:LINKS", "view_message_list_attach")>
+<?!("X", 8)>
 
 </div>
 </div>