* 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 7fd334977b217dace7eba0d1856f906da29b7a3f..59ecb1e5f23be5aa6d282b5047ba0281415a0465 100644 (file)
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -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;