Removed Msg->reply_to because it held data for an older version of the code, we no...

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 60f569ad5f8216a9fb474bb2a733d2e03b3a2e76..ed58d93d519be015747afa000ddb3b2d4869334a 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -51,9 +51,7 @@ void DestroyMessageSummary(void *vMsg)
        FreeStrBuf(&Msg->Rfca);
        FreeStrBuf(&Msg->OtherNode);
 
-       FreeStrBuf(&Msg->reply_to);
-
-       DeleteHash(&Msg->Attachments);  /**< list of Accachments */
+       DeleteHash(&Msg->Attachments);  /* list of Attachments */
        DeleteHash(&Msg->Submessages);
        DeleteHash(&Msg->AttachLinks);
        DeleteHash(&Msg->AllAttach);
@@ -963,7 +961,8 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
        StrBuf *Line1;
        StrBuf *Line2;
        StrBuf *Target;
-
+       long Linecount;
+       long nEmptyLines;
        int bn = 0;
        int bq = 0;
        int i;
@@ -1009,7 +1008,8 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
        Line1 = NewStrBufPlain(NULL, SIZ);
        Line2 = NewStrBufPlain(NULL, SIZ);
        Target = NewStrBufPlain(NULL, StrLength(Mime->Data));
-
+       Linecount = 0;
+       nEmptyLines = 0;
        if (StrLength(Mime->Data) > 0) 
                do 
                {
@@ -1032,10 +1032,14 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
                        if (i > 0) StrBufCutLeft(Line, i);
                
                        if (StrLength(Line) == 0) {
+                               if (Linecount == 0)
+                                       continue;
                                StrBufAppendBufPlain(Target, HKEY("<tt></tt><br>\n"), 0);
+
+                               nEmptyLines ++;
                                continue;
                        }
-
+                       nEmptyLines = 0;
                        for (i = bn; i < bq; i++)                               
                                StrBufAppendBufPlain(Target, HKEY("<blockquote>"), 0);
                        for (i = bq; i < bn; i++)                               
@@ -1051,10 +1055,13 @@ void render_MAIL_text_plain(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *F
                        StrEscAppend(Target, Line1, NULL, 0, 0);
                        StrBufAppendBufPlain(Target, HKEY("</tt><br>\n"), 0);
                        bn = bq;
+                       Linecount ++;
                }
        while ((BufPtr != StrBufNOTNULL) &&
               (BufPtr != NULL));
 
+       if (nEmptyLines > 0)
+               StrBufCutRight(Target, nEmptyLines * (sizeof ("<tt></tt><br>\n") - 1));
        for (i = 0; i < bn; i++)                                
                StrBufAppendBufPlain(Target, HKEY("</blockquote>"), 0);
 
@@ -1221,6 +1228,11 @@ HashList *iterate_get_registered_Attachments(StrBuf *Target, WCTemplputParams *T
        return WC->attachments;
 }
 
+void get_registered_Attachments_Count(StrBuf *Target, WCTemplputParams *TP)
+{
+       StrBufAppendPrintf(Target, "%ld", GetCount (WC->attachments));
+}
+
 void servcmd_do_search(char *buf, long bufsize)
 {
        snprintf(buf, bufsize, "MSGS SEARCH|%s", bstr("query"));
@@ -1498,6 +1510,8 @@ InitModule_MSGRENDERERS
        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 */
        RegisterMimeRenderer(HKEY("message/rfc822"), render_MAIL, 0, 150);
        RegisterMimeRenderer(HKEY("text/vnote"), render_MIME_VNote, 1, 300);