Created ctdl_iconv_open() wrapper around iconv_open()

[citadel.git] / webcit / messages.c

diff --git a/webcit/messages.c b/webcit/messages.c
index b4657c9b5bbbd4e7a74877869cd3ed68ed411292..ec3e13ff9580a051e0a54e8150a9faa68a3ad9de 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -3,6 +3,7 @@
  */
 /**
  * \defgroup MsgDisp Functions which deal with the fetching and displaying of messages.
+ * \ingroup WebcitDisplayItems
  *
  */
 /*@{*/
@@ -27,6 +28,32 @@ struct addrbookent {
 
 
 #ifdef HAVE_ICONV
+
+/**
+ * \brief      Wrapper around iconv_open()
+ *             Our version adds aliases for non-standard Microsoft charsets
+ *              such as 'MS950', aliasing them to names like 'CP950'
+ *
+ * \param      tocode          Target encoding
+ * \param      fromcode        Source encoding
+ */
+iconv_t ctdl_iconv_open(const char *tocode, const char *fromcode)
+{
+       iconv_t ic = (iconv_t)(-1) ;
+       ic = iconv_open(tocode, fromcode);
+       if (ic == (iconv_t)(-1) ) {
+               char alias_fromcode[64];
+               if ( (strlen(fromcode) == 5) && (!strncasecmp(fromcode, "MS", 2)) ) {
+                       safestrncpy(alias_fromcode, fromcode, sizeof alias_fromcode);
+                       alias_fromcode[0] = 'C';
+                       alias_fromcode[1] = 'P';
+                       ic = iconv_open(tocode, alias_fromcode);
+               }
+       }
+       return(ic);
+}
+
+
 /**
  * \brief  Handle subjects with RFC2047 encoding
  *  such as:
@@ -72,7 +99,7 @@ void utf8ify_rfc822_string(char *buf) {
                        ibuflen = strlen(istr);
                }
 
-               ic = iconv_open("UTF-8", charset);
+               ic = ctdl_iconv_open("UTF-8", charset);
                if (ic != (iconv_t)(-1) ) {
                        obuf = malloc(1024);
                        obuflen = 1024;
@@ -654,13 +681,16 @@ void read_message(long msgnum, int printable_view, char *section) {
                }
                if (!strncasecmp(buf, "rcpt=", 5)) {
                        wprintf(_("to "));
-                       escputs(&buf[5]);
-                       wprintf(" ");
                        if (strlen(reply_all) > 0) {
                                strcat(reply_all, ", ");
                        }
                        safestrncpy(&reply_all[strlen(reply_all)], &buf[5],
                                (sizeof reply_all - strlen(reply_all)) );
+#ifdef HAVE_ICONV
+                       utf8ify_rfc822_string(&buf[5]);
+#endif
+                       escputs(&buf[5]);
+                       wprintf(" ");
                }
                if (!strncasecmp(buf, "time=", 5)) {
                        fmt_date(now, atol(&buf[5]), 0);
@@ -691,15 +721,21 @@ void read_message(long msgnum, int printable_view, char *section) {
                             || (!strcasecmp(mime_disposition, "inline")) ) {
                                snprintf(&mime_http[strlen(mime_http)],
                                        (sizeof(mime_http) - strlen(mime_http) - 1),
-                                       "<a href=\"mimepart/%ld/%s/%s\" "
-                                       "target=\"wc.%ld.%s\">"
                                        "<img src=\"static/diskette_24x.gif\" "
                                        "border=0 align=middle>\n"
-                                       "%s (%s, %d bytes)</a><br />\n",
+                                       "%s (%s, %d bytes) [ "
+                                       "<a href=\"mimepart/%ld/%s/%s\""
+                                       "target=\"wc.%ld.%s\">%s</a>"
+                                       " | "
+                                       "<a href=\"mimepart_download/%ld/%s/%s\">%s</a>"
+                                       " ]<br />\n",
+                                       mime_filename,
+                                       mime_content_type, mime_length,
                                        msgnum, mime_partnum, mime_filename,
                                        msgnum, mime_partnum,
-                                       mime_filename,
-                                       mime_content_type, mime_length
+                                       _("View"),
+                                       msgnum, mime_partnum, mime_filename,
+                                       _("Download")
                                );
                        }
 
@@ -887,7 +923,7 @@ void read_message(long msgnum, int printable_view, char *section) {
           && (strcasecmp(mime_charset, "UTF-8"))
           && (strcasecmp(mime_charset, ""))
        ) {
-               ic = iconv_open("UTF-8", mime_charset);
+               ic = ctdl_iconv_open("UTF-8", mime_charset);
                if (ic == (iconv_t)(-1) ) {
                        lprintf(5, "%s:%d iconv_open(UTF-8, %s) failed: %s\n",
                                __FILE__, __LINE__, mime_charset, strerror(errno));
@@ -1283,7 +1319,7 @@ void pullquote_message(long msgnum, int forward_attachments, int include_headers
           && (strcasecmp(mime_charset, "UTF-8"))
           && (strcasecmp(mime_charset, ""))
        ) {
-               ic = iconv_open("UTF-8", mime_charset);
+               ic = ctdl_iconv_open("UTF-8", mime_charset);
                if (ic == (iconv_t)(-1) ) {
                        lprintf(5, "%s:%d iconv_open() failed: %s\n",
                                __FILE__, __LINE__, strerror(errno));
@@ -2042,7 +2078,8 @@ void readloop(char *oper)
 
        is_singlecard = atoi(bstr("is_singlecard"));
 
-       if (WC->wc_view == VIEW_CALENDAR) {             /**< calendar */
+       if ((WC->wc_view == VIEW_CALENDAR) ||
+               (WC->wc_view == VIEW_CALBRIEF)){                /**< calendar */
                is_calendar = 1;
                strcpy(cmd, "MSGS ALL");
                maxmsgs = 32767;
@@ -2428,7 +2465,7 @@ void post_mime_to_server(void) {
        }
 
        if (is_multipart) {
-               sprintf(boundary, "---Citadel-Multipart-%s-%04x%04x---",
+               sprintf(boundary, "=_Citadel_Multipart_%s_%04x%04x",
                        serv_info.serv_fqdn,
                        getpid(),
                        ++seq
@@ -2442,12 +2479,12 @@ void post_mime_to_server(void) {
        }
 
        serv_puts("Content-type: text/html; charset=utf-8");
+       serv_puts("Content-Transfer-Encoding: quoted-printable");
        serv_puts("");
-       serv_puts("<html><body>\n");            /** Future templates go here */
-       text_to_server(bstr("msgtext"), 0);
-       serv_puts("</body></html>\n");
+       serv_puts("<html><body>\r\n");
+       text_to_server_qp(bstr("msgtext"));     /** Transmit message in quoted-printable encoding */
+       serv_puts("</body></html>\r\n");
        
-
        if (is_multipart) {
 
                /** Add in the attachments */
@@ -2645,7 +2682,8 @@ void display_enter(void)
         * Are we perhaps in a calendar view?  If so, then an "enter
         * message" command really means "add new calendar item."
         */
-       if (WC->wc_view == VIEW_CALENDAR) {
+       if ((WC->wc_view == VIEW_CALENDAR) ||
+               (WC->wc_view == VIEW_CALBRIEF)){
                display_edit_event();
                return;
        }
@@ -2719,8 +2757,11 @@ void display_enter(void)
        stresc(&buf[strlen(buf)], WC->wc_roomname, 1, 1);
 
        /** begin message entry screen */
-       wprintf("<form enctype=\"multipart/form-data\" "
-               "method=\"POST\" action=\"post\" "
+       wprintf("<form "
+               "enctype=\"multipart/form-data\" "
+               "method=\"POST\" "
+               "accept-charset=\"UTF-8\" "
+               "action=\"post\" "
                "name=\"enterform\""
                ">\n");
        wprintf("<input type=\"hidden\" name=\"postseq\" value=\"%ld\">\n", now);