* swap I/O to the new functions

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 8ca86433efab0e537366a97b0ed2db9e0ddf4329..356fdceb2454fe4d6995bc2e945ae948185be738 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -366,10 +366,12 @@ int Conditional_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
 
 void examine_node(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset)
 {
+       wcsession *WCC = WC;
+
        if ( (StrLength(HdrLine) > 0) &&
             ((WC->room_flags & QR_NETWORK)
-             || ((strcasecmp(ChrPtr(HdrLine), ChrPtr(serv_info.serv_nodename))
-                  && (strcasecmp(ChrPtr(HdrLine), ChrPtr(serv_info.serv_fqdn))))))) {
+             || ((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);
        }
@@ -439,7 +441,7 @@ void tmplput_MAIL_SUMM_DATE_BRIEF(StrBuf *Target, WCTemplputParams *TP)
 {
        char datebuf[64];
        message_summary *Msg = (message_summary*) CTX;
-       webcit_fmt_date(datebuf, Msg->date, 1);
+       webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_BRIEF);
        StrBufAppendBufPlain(Target, datebuf, -1, 0);
 }
 
@@ -447,7 +449,7 @@ void tmplput_MAIL_SUMM_DATE_FULL(StrBuf *Target, WCTemplputParams *TP)
 {
        char datebuf[64];
        message_summary *Msg = (message_summary*) CTX;
-       webcit_fmt_date(datebuf, Msg->date, 0);
+       webcit_fmt_date(datebuf, 64, Msg->date, DATEFMT_FULL);
        StrBufAppendBufPlain(Target, datebuf, -1, 0);
 }
 void tmplput_MAIL_SUMM_DATE_NO(StrBuf *Target, WCTemplputParams *TP)
@@ -493,7 +495,7 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
                }
 
                /* In all cases, display the full card */
-               display_vcard(Buf, ChrPtr(Mime->Data), 0, 1, NULL, Mime->msgnum);
+               display_vcard(Buf, Mime->Data, 0, 1, NULL, Mime->msgnum);
                FreeStrBuf(&Mime->Data);
                Mime->Data = Buf;
        }
@@ -535,7 +537,7 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
        Mime->PartNum = NewStrBuf();
        StrBufExtract_token(Mime->PartNum, HdrLine, 2, '|');
        StrBufTrim(Mime->PartNum);
-       if (strchr(ChrPtr(Mime->PartNum), '.') != NULL)
+       if (strchr(ChrPtr(Mime->PartNum), '.') != NULL) 
                Mime->level = 2;
        else
                Mime->level = 1;
@@ -548,6 +550,10 @@ void examine_mime_part(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundChars
        StrBufTrim(Mime->ContentType);
        StrBufLowerCase(Mime->ContentType);
 
+       if (!strcmp(ChrPtr(Mime->ContentType), "application/octet-stream")) {
+               StrBufPlain(Mime->ContentType, 
+                           GuessMimeByFilename(SKEY(Mime->FileName)), -1);
+       }
        Mime->length = StrBufExtract_int(HdrLine, 5, '|');
 
        if ( (StrLength(Mime->FileName) == 0) && (StrLength(Mime->Name) > 0) ) {
@@ -1126,7 +1132,7 @@ InitModule_MSGRENDERERS
        RegisterNamespace("MAIL:SUMM:ORGROOM", 0, 2, tmplput_MAIL_SUMM_ORGROOM,  CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:RFCA", 0, 2, tmplput_MAIL_SUMM_RFCA,  CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:OTHERNODE", 2, 0, tmplput_MAIL_SUMM_OTHERNODE,  CTX_MAILSUM);
-       RegisterNamespace("MAIL:SUMM:REFIDS", 0, 0, tmplput_MAIL_SUMM_REFIDS,  CTX_MAILSUM);
+       RegisterNamespace("MAIL:SUMM:REFIDS", 0, 1, tmplput_MAIL_SUMM_REFIDS,  CTX_MAILSUM);
        RegisterNamespace("MAIL:SUMM:INREPLYTO", 0, 2, tmplput_MAIL_SUMM_INREPLYTO,  CTX_MAILSUM);
        RegisterNamespace("MAIL:BODY", 0, 2, tmplput_MAIL_BODY,  CTX_MAILSUM);
        RegisterNamespace("MAIL:QUOTETEXT", 1, 2, tmplput_QUOTED_MAIL_BODY,  CTX_NONE);