* Changed some of the '&' between url parameters to '?' (ongoing)

[citadel.git] / webcit / msg_renderers.c

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index bf387c3fc2e3c502c4413f0a6175a780ad7ad3ae..59ecb1e5f23be5aa6d282b5047ba0281415a0465 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -475,9 +475,9 @@ void render_MAIL(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundCharset
                for (i=0; i<num_tokens(mime_submessages, '|'); ++i) {
                        extract_token(buf, mime_submessages, i, '|', sizeof buf);
                        / ** use printable_view to suppress buttons * /
-                       wprintf("<blockquote>");
+                       wc_printf("<blockquote>");
                        read_message(Mime->msgnum, 1, ChrPtr(Mime->Section));
-                       wprintf("</blockquote>");
+                       wc_printf("</blockquote>");
                }
        }
 */
@@ -495,7 +495,7 @@ void render_MIME_VCard(wc_mime_attachment *Mime, StrBuf *RawData, StrBuf *FoundC
                        || (!strcasecmp(&(ChrPtr(WCC->wc_roomname)[11]), USERCONFIGROOM))
                        || (WC->wc_view == VIEW_ADDRESSBOOK)
                        ) {
-                       StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld&partnum=%s\">",
+                       StrBufAppendPrintf(Buf, "<a href=\"edit_vcard?msgnum=%ld?partnum=%s\">",
                                Mime->msgnum, ChrPtr(Mime->PartNum));
                        StrBufAppendPrintf(Buf, "[%s]</a>", _("edit"));
                }
@@ -803,13 +803,13 @@ void tmplput_EDIT_MAIL_BODY(StrBuf *Target, WCTemplputParams *TP)
        FreeStrBuf(&Buf);
 }
 
-void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)      // FIXME
+void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP)
 {
        const StrBuf *Mime;
         long msgnum;
        StrBuf *Buf;
 
-       msgnum = locate_message_by_uid(BSTR("wikipage"));
+       msgnum = locate_message_by_uid(BSTR("page"));
        if (msgnum >= 0L) {
                Buf = NewStrBuf();
                read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime);
@@ -1066,8 +1066,9 @@ void tmplput_MIME_LoadData(StrBuf *Target, WCTemplputParams *TP)
        wc_mime_attachment *mime = (wc_mime_attachment*) CTX;
        wc_mime_attachment *att;
        
-       if ( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
-            (!strcasecmp(ChrPtr(mime->Disposition), "attachment")) ) 
+       if (( (!strcasecmp(ChrPtr(mime->Disposition), "inline"))||
+             (!strcasecmp(ChrPtr(mime->Disposition), "attachment"))) && 
+           (strcasecmp(ChrPtr(mime->ContentType), "application/ms-tnef")!=0))
        {
                
                int n;
@@ -1405,18 +1406,18 @@ int bbsview_RenderView_or_Tail(SharedMessageStatus *Stat,
 
        VS = (bbsview_struct*)*ViewSpecific;
        if (Stat->nummsgs == 0) {
-               wprintf("<div class=\"nomsgs\"><br><em>");
+               wc_printf("<div class=\"nomsgs\"><br><em>");
                switch (oper) {
                case readnew:
-                       wprintf(_("No new messages."));
+                       wc_printf(_("No new messages."));
                        break;
                case readold:
-                       wprintf(_("No old messages."));
+                       wc_printf(_("No old messages."));
                        break;
                default:
-                       wprintf(_("No messages here."));
+                       wc_printf(_("No messages here."));
                }
-               wprintf("</em><br></div>\n");
+               wc_printf("</em><br></div>\n");
        }
        else 
        {
@@ -1448,7 +1449,7 @@ int bbsview_Cleanup(void **ViewSpecific)
        bbsview_struct *VS;
 
        VS = (bbsview_struct*)*ViewSpecific;
-       end_burst();
+       wDumpContent(1);
        FreeStrBuf(&VS->BBViewToolBar);
        FreeStrBuf(&VS->MessageDropdown);
        free(VS);