Rather than converting the content-type from multipart/alternative

to multipart/mixed, use hypermail's set_save_alts to do the same in
a cleaner way.
The Apple Mail ua header value may change depening on what device
is used. Changed set_applemail_ua_value to a list so that new ones
can be added if needed. The default list values are "Apple iPhone"
(concatenanted to "Mail (" during the check (

Author: jkbzh

src/defaults.h.in

@@ -31,4 +31,6 @@
 
 #define ANTISPAM_AT   "_at_"
 
+#define APPLE_MAIL_UA "Apple iPhone"
+
 #endif

src/parse.c

@@ -174,6 +174,28 @@ int textcontent(char *type)
     return 0;
 }
 
+static int applemail_ua(char *ua_string)
+{
+    /* returns TRUE if the ua_string is one of the declared applemail
+     * clients */
+
+    int res = FALSE;
+
+    if (ua_string && *ua_string != '\0') {
+        char *buff;
+        char *ptr;
+
+        buff = strsav(ua_string);
+        ptr = strstr(buff, " (");
+        if (ptr) {
+            *ptr = '\0';
+            res = inlist(set_applemail_ua_value, buff);
+        }
+        free(buff);
+    }
+
+    return TRUE;
+}
 
 /*
  * Should return TRUE if the input is a Re: start. The end pointer should
@@ -1197,24 +1219,6 @@ static int do_uudecode(FILE *fp, char *line, char *line_buf,
     return 1;
 }
 
-/* 
- *  If we have a multipart/alternative header,
- *  return a new header that uses multipart/mixed. This will allow to see the
- *  the attachments that are only added to the text/html alternative.
- */
-static char *mpa_as_mpm (char *content_type)
-{
-    char *new_header;
-    
-    if (!strncasecmp(content_type + 14, "multipart/alternative", 21)) {
-        new_header = replace(content_type, "/alternative", "/mixed");
-    } else {
-        new_header = NULL;
-    }
-
-    return new_header;
-}
-
 static void write_txt_file(struct emailinfo *emp, struct Push *raw_text_buf)
 {
     char *txt_filename;
@@ -1272,6 +1276,7 @@ int parsemail(char *mbox,	/* file name */
     time_t delete_newer_than = (set_delete_newer ? convtoyearsecs(set_delete_newer) : 0);
     int is_deleted = 0;
     int parse_multipart_alternative_as_mixed = 0; /* the hack needed for applemail */
+    int old_set_save_alts = 0;
     int applemail_ua_header_len = (set_applemail_mimehack) ? strlen (set_applemail_ua_header) : 0;
     int pos;
     bool *require_filter, *require_filter_full;
@@ -1399,6 +1404,9 @@ int parsemail(char *mbox,	/* file name */
     bp = NULL;
     subject = NOSUBJECT;
 
+    parse_multipart_alternative_as_mixed = 0;
+    old_set_save_alts = 0;
+    
     require_filter_len = require_filter_full_len = 0;
     for (tlist = set_filter_require; tlist != NULL; require_filter_len++, tlist = tlist->next)
 	;
@@ -1582,17 +1590,20 @@ int parsemail(char *mbox,	/* file name */
                     else if (!strncasecmp (head->line, "Content-Type:", 13)) {
                         content_type_p = head;
                     }
-		    else if (set_applemail_mimehack
+		    else if (!set_save_alts
+			     && set_applemail_mimehack
+                             && set_applemail_ua_header && *set_applemail_ua_header
                              && Mime_B
                              && !alternativeparser
                              && !strncasecmp(head_name,
                                              set_applemail_ua_header,
-                                             applemail_ua_header_len)
-                             && !strncasecmp(head->line + applemail_ua_header_len + 2,
-                                             set_applemail_ua_value,
-                                             strlen(set_applemail_ua_value))) {
-                        /* If we need the applemail hack, set a flag if we detected the UA */
-                        parse_multipart_alternative_as_mixed = 1;
+                                             applemail_ua_header_len)) {
+                        /* If we need the applemail hack, set a flag
+                         * if we detected the UA */
+                        head->parsedheader = TRUE;
+                        if (applemail_ua (head->line + applemail_ua_header_len + 2)) {
+                            parse_multipart_alternative_as_mixed = 1;
+                        }
                     }
                 }
 
@@ -1610,16 +1621,14 @@ int parsemail(char *mbox,	/* file name */
 		    if (email_time != -1 && email_time > delete_newer_than)
 		        is_deleted = FILTERED_NEW;
 		}
-                if (set_applemail_mimehack && parse_multipart_alternative_as_mixed) {
-                    char *new_header;
-                    
-                    new_header = mpa_as_mpm (content_type_p->line);
-                    if (new_header) {
-                        free(content_type_p->line);
-                        content_type_p->line = new_header;
+                if (parse_multipart_alternative_as_mixed == 1) {
+                    if (!strncasecmp(content_type_p->line + 14, "multipart/alternative", 21)) {
+                        old_set_save_alts = set_save_alts;
+                        set_save_alts = 1;                        
                     }
+
                     /* turn off the flag to avoid redoing this check again */
-                    parse_multipart_alternative_as_mixed = 0;
+                    parse_multipart_alternative_as_mixed = 2;
                 }
 		if (!headp)
 		    headp = bp;
@@ -2287,7 +2296,11 @@ msgid);
 
                 alternativeparser = FALSE; /* there is none anymore */
 
-                parse_multipart_alternative_as_mixed = 0;
+		if (parse_multipart_alternative_as_mixed) {
+		  set_save_alts = old_set_save_alts;
+		  old_set_save_alts = 0;
+		  parse_multipart_alternative_as_mixed = 0;
+		}
 
 		if (!(num % 10) && set_showprogress && !readone) {
 		    print_progress(num - startnum, NULL, NULL);

src/setup.c

@@ -77,7 +77,6 @@ bool set_use_sender_date;
 bool set_inline_addlink;
 bool set_applemail_mimehack;
 char *set_applemail_ua_header;
-char *set_applemail_ua_value;
 
 int set_showhtml;
 int set_thrdlevels;
@@ -128,6 +127,7 @@ struct hmlist *set_filter_out = NULL;
 struct hmlist *set_filter_require = NULL;
 struct hmlist *set_filter_out_full_body = NULL;
 struct hmlist *set_filter_require_full_body = NULL;
+struct hmlist *set_applemail_ua_value;
 
 char *set_ihtmlheader;
 char *set_ihtmlfooter;
@@ -497,8 +497,8 @@ struct Config cfg[] = {
      "# This option is only useful if you enabled the applemail_mimehack configuration\n"
      "# option.\n", FALSE},
 
-    {"applemail_ua_value", &set_applemail_ua_value, "Apple Mail (", CFG_STRING,
-     "# Set to the beginning of the header value that Apple Mail uses to identify\n"
+    {"applemail_ua_value", &set_applemail_ua_value, APPLE_MAIL_UA, CFG_LIST,
+     "# Set to the list of the header value that Apple Mail uses to identify\n"
      " its mail agent. Do not add the version number unless you know what you're doing.\n"
      "# This option is only useful if you enabled the applemail_mimehack configuration\n"
      "# option.\n", FALSE},
@@ -1257,8 +1257,6 @@ void dump_config(void)
     printf("set_latest_folder = %s\n",set_latest_folder ? set_latest_folder : "Not set");
     printf("set_antispamdomain = %s\n",set_antispamdomain ? set_antispamdomain : "Not set");
     printf("set_applemail_ua_header = %s\n",set_applemail_ua_header ? set_applemail_ua_header : "Not set");
-    printf("set_applemail_ua_value = %s\n",set_applemail_ua_value ? set_applemail_ua_value : "Not set");    
-    
 
     /* Boolean or integer */
 
@@ -1386,7 +1384,9 @@ void dump_config(void)
     print_list("set_deleted", set_deleted);
     print_list("set_expires", set_expires);
     print_list("set_delete_msgnum", set_delete_msgnum);
-
+    print_list("set_applemail_ua_value", set_applemail_ua_value);
+    
+    
 }
 
 #endif

src/setup.h

@@ -96,7 +96,6 @@ extern bool set_use_sender_date;
 extern bool set_inline_addlink;
 extern bool set_applemail_mimehack;
 extern char *set_applemail_ua_header;
-extern char *set_applemail_ua_value;
 
 extern int set_showhtml;
 extern int set_thrdlevels;
@@ -143,6 +142,7 @@ extern struct hmlist *set_filter_out;
 extern struct hmlist *set_filter_require;
 extern struct hmlist *set_filter_out_full_body;
 extern struct hmlist *set_filter_require_full_body;
+extern struct hmlist *set_applemail_ua_value;
 
 extern char *set_ihtmlheader;
 extern char *set_ihtmlfooter;