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

[citadel.git] / webcit / html2html.c

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 2e19e58e9eecb08b40c269573a11173b817532dc..1daf7b4103218872572b09c5e9186b3d27f10485 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -369,7 +369,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
                if (!strncasecmp(ptr, "<a href=\"mailto:", 16)) {
                        content_length += 64;
                        StrBufAppendPrintf(converted_msg,
-                                       "<a href=\"display_enter?force_room=_MAIL_&recp=");
+                                       "<a href=\"display_enter?force_room=_MAIL_?recp=");
                        ptr = &ptr[16];
                        ++alevel;
                        ++brak;
@@ -397,8 +397,9 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
                }
                /** Fixup <img src="cid:... ...> to fetch the mime part */
                else if (!strncasecmp(ptr, "<img ", 5)) {
+                       char *cid_start, *cid_end;
                        char* tag_end=strchr(ptr,'>');
-
+                       char* src;
                        /* FIXME - handle this situation (maybe someone opened an <img cid... 
                         * and then ended the message)
                         */
@@ -408,8 +409,7 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
                                lprintf(9, "Theoretical bytes remaining: %d\n", msgend - ptr);
                        }
 
-                       char* src=strstr(ptr, " src=\"cid:");
-                       char *cid_start, *cid_end;
+                       src=strstr(ptr, " src=\"cid:");
                        ++brak;
 
                        if (src