* abstract #ifdef HAVE_ICONV around utf8ify_rfc822_string to one place as they starte...

* de-QP email-attachment filenames
* put icon/mime logic into the attachment list
* if we have an application/octet-stream, try to guess the mime for the icon by its extension

diff --git a/webcit/messages.c b/webcit/messages.c
index 4a27453f665bcef2ff4aa8e6dc5b7a1c0951e39e..0cba298b0611b600934b7d2737a9e0367e73afe1 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -243,6 +243,9 @@ void utf8ify_rfc822_string(char *buf) {
        }
 
 }
+#else
+inline void utf8ify_rfc822_string(char *a){};
+
 #endif
 
 
@@ -495,9 +498,7 @@ void display_parsed_vcard(struct vCard *v, int full) {
                        len = strlen(v->prop[i].value);
                        /* if we have some untagged QP, detect it here. */
                        if (!is_qp && (strstr(v->prop[i].value, "=?")!=NULL))
-#ifdef HAVE_ICONV
                                utf8ify_rfc822_string(v->prop[i].value);
-#endif
 
                        if (is_qp) {
                                // %ff can become 6 bytes in utf8 
@@ -688,9 +689,7 @@ void display_vcard(char *vcard_source, char alpha, int full, char *storename) {
 
        name = vcard_get_prop(v, "n", 1, 0, 0);
        if (name != NULL) {
-#ifdef HAVE_ICONV
                utf8ify_rfc822_string(name);
-#endif
                strcpy(buf, name);
                this_alpha = buf[0];
        }
@@ -729,6 +728,7 @@ void read_message(long msgnum, int printable_view, char *section) {
        char mime_filename[256] = "";
        char escaped_mime_filename[256] = "";
        char mime_content_type[256] = "";
+       const char *mime_content_type_ptr;
        char mime_charset[256] = "";
        char mime_disposition[256] = "";
        int mime_length;
@@ -804,9 +804,7 @@ void read_message(long msgnum, int printable_view, char *section) {
                        strcpy(from, &buf[5]);
                        wprintf(_("from "));
                        wprintf("<a href=\"showuser?who=");
-#ifdef HAVE_ICONV
                        utf8ify_rfc822_string(from);
-#endif
                        urlescputs(from);
                        wprintf("\">");
                        escputs(from);
@@ -861,9 +859,7 @@ void read_message(long msgnum, int printable_view, char *section) {
                        len = strlen(reply_all);
                        safestrncpy(&reply_all[len], &buf[5],
                                (sizeof reply_all - len) );
-#ifdef HAVE_ICONV
                        utf8ify_rfc822_string(&buf[5]);
-#endif
                        escputs(&buf[5]);
                        wprintf(" ");
                }
@@ -913,9 +909,16 @@ void read_message(long msgnum, int printable_view, char *section) {
                                attach_links = realloc(attach_links,
                                        (num_attach_links*sizeof(struct attach_link)));
                                safestrncpy(attach_links[num_attach_links-1].partnum, mime_partnum, 32);
+                               utf8ify_rfc822_string(mime_filename);
+
+                               mime_content_type_ptr = mime_content_type;
+                               if (strcasecmp(mime_content_type, "application/octet-stream") == 0) {
+                                       mime_content_type_ptr = GuessMimeByFilename(mime_filename, 
+                                                                                   strlen(mime_filename));
+                               }
                                urlesc(escaped_mime_filename, 265, mime_filename);
                                snprintf(attach_links[num_attach_links-1].html, 1024,
-                                       "<img src=\"static/diskette_24x.gif\" "
+                                       "<img src=\"display_mime_icon?type=%s\" "
                                        "border=0 align=middle>\n"
                                        "%s (%s, %d bytes) [ "
                                        "<a href=\"mimepart/%ld/%s/%s\""
@@ -923,6 +926,7 @@ void read_message(long msgnum, int printable_view, char *section) {
                                        " | "
                                        "<a href=\"mimepart_download/%ld/%s/%s\">%s</a>"
                                        " ]<br />\n",
+                                       mime_content_type_ptr,
                                        mime_filename,
                                        mime_content_type, mime_length,
                                        msgnum, mime_partnum, escaped_mime_filename,
@@ -975,10 +979,8 @@ void read_message(long msgnum, int printable_view, char *section) {
                wprintf("****");
        }
 
-#ifdef HAVE_ICONV
        utf8ify_rfc822_string(m_cc);
        utf8ify_rfc822_string(m_subject);
-#endif
 
         /** start msg buttons */
 
@@ -1433,9 +1435,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
                        if (!strncasecmp(buf, "from=", 5)) {
                                strcpy(from, &buf[5]);
                                wprintf(_("from "));
-#ifdef HAVE_ICONV
                                utf8ify_rfc822_string(from);
-#endif
                                msgescputs(from);
                        }
                        if (!strncasecmp(buf, "subj=", 5)) {
@@ -1471,9 +1471,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
                        if (!strncasecmp(buf, "rcpt=", 5)) {
                                wprintf(_("to "));
                                strcpy(to, &buf[5]);
-#ifdef HAVE_ICONV
                                utf8ify_rfc822_string(to);
-#endif
                                wprintf("%s ", to);
                        }
                        if (!strncasecmp(buf, "time=", 5)) {
@@ -1505,9 +1503,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
        if (include_headers) {
                wprintf("<br>");
 
-#ifdef HAVE_ICONV
                utf8ify_rfc822_string(m_subject);
-#endif
                if (!IsEmptyStr(m_subject)) {
                        wprintf(_("Subject:"));
                        wprintf(" ");
@@ -2064,18 +2060,14 @@ int load_msg_ptrs(char *servcmd, int with_headers)
                                safestrncpy(WC->summ[nummsgs-1].subj,
                                        _("(no subject)"), sizeof WC->summ[nummsgs-1].subj);
                                if (!IsEmptyStr(fullname)) {
-#ifdef HAVE_ICONV
                                /** Handle senders with RFC2047 encoding */
                                        utf8ify_rfc822_string(fullname);
-#endif
                                        safestrncpy(WC->summ[nummsgs-1].from,
                                                fullname, sizeof WC->summ[nummsgs-1].from);
                                }
                                if (!IsEmptyStr(subject)) {
-#ifdef HAVE_ICONV
                                /** Handle subjects with RFC2047 encoding */
                                        utf8ify_rfc822_string(subject);
-#endif
                                        safestrncpy(WC->summ[nummsgs-1].subj, subject,
                                                    sizeof WC->summ[nummsgs-1].subj);
                                }
@@ -2095,10 +2087,8 @@ int load_msg_ptrs(char *servcmd, int with_headers)
 
                                WC->summ[nummsgs-1].date = datestamp;
        
-#ifdef HAVE_ICONV
                                /** Handle senders with RFC2047 encoding */
                                utf8ify_rfc822_string(WC->summ[nummsgs-1].from);
-#endif
                                if (strlen(WC->summ[nummsgs-1].from) > 25) {
                                        strcpy(&WC->summ[nummsgs-1].from[22], "...");
                                }
@@ -3315,9 +3305,7 @@ void display_enter(void)
                len = strlen(ccraw);
                copy = (char*) malloc(len * 2 + 1);
                memcpy(copy, ccraw, len + 1); 
-#ifdef HAVE_ICONV
                utf8ify_rfc822_string(copy);
-#endif
                escputs(copy);
                free(copy);
                wprintf("\" size=45 maxlength=1000 />");
@@ -3345,9 +3333,7 @@ void display_enter(void)
                len = strlen(ccraw);
                copy = (char*) malloc(len * 2 + 1);
                memcpy(copy, ccraw, len + 1); 
-#ifdef HAVE_ICONV
                utf8ify_rfc822_string(copy);
-#endif
                escputs(copy);
                free(copy);
                wprintf("\" size=45 maxlength=1000 />");
@@ -3362,9 +3348,7 @@ void display_enter(void)
                len = strlen(ccraw);
                copy = (char*) malloc(len * 2 + 1);
                memcpy(copy, ccraw, len + 1); 
-#ifdef HAVE_ICONV
                utf8ify_rfc822_string(copy);
-#endif
                escputs(copy);
                free(copy);
                wprintf("\" size=45 maxlength=1000 />");

diff --git a/webcit/rss.c b/webcit/rss.c
index fd8fad0ea265294e2294d86a9d722b81283d38e3..f86fb97b712eeb212cc088e1191b23e32b0d6348 100644 (file)
--- a/webcit/rss.c
+++ b/webcit/rss.c
@@ -182,14 +182,10 @@ void display_rss(char *roomname, char *request_method)
                                goto ENDITEM;   /** screw it */
                        } else if (!strncasecmp(buf, "from=", 5)) {
                                strcpy(from, &buf[5]);
-#ifdef HAVE_ICONV
                                utf8ify_rfc822_string(from);
-#endif
                        } else if (!strncasecmp(buf, "subj=", 5)) {
                                strcpy(subj, &buf[5]);
-#ifdef HAVE_ICONV
                                utf8ify_rfc822_string(subj);
-#endif
                        } else if (!strncasecmp(buf, "hnod=", 5)) {
                                strcpy(node, &buf[5]);
                        } else if (!strncasecmp(buf, "room=", 5)) {

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 39520caccf4614c86e5a865aaef8564539763bd0..96977c5670bae5b30ce2622e91bfc5facfb04c94 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -790,9 +790,7 @@ int ZEXPORT compress_gzip(Bytef * dest, size_t * destLen,
                           const Bytef * source, uLong sourceLen, int level);
 #endif
 
-#ifdef HAVE_ICONV
 void utf8ify_rfc822_string(char *buf);
-#endif
 
 void begin_burst(void);
 void end_burst(void);