Changeset e0bd705 in github

Timestamp:

Oct 20, 2010 7:41:48 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

8794f16

Parents:

2ae58f1

Message:

• Add workaround for some Outlook's wrong content-types, per discussion in #1487051

Location:

program/steps/mail

Files:

• func.inc (modified) (1 diff)
• get.inc (modified) (1 diff)
• show.inc (modified) (1 diff)

program/steps/mail/func.inc

@@ -1718 +1718 @@
 }
 
+// Fixes some content-type names
+function rcmail_fix_mimetype($name)
+{
+  // Some versions of Outlook create garbage Content-Type:
+  // application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608
+  if (preg_match('/^application\/pdf.+/', $name))
+    $name = 'application/pdf';
+
+  return $name;
+}
 
 function rcmail_search_filter($attrib)

program/steps/mail/get.inc

@@ -92 +92 @@
     }
     else {
+      $mimetype = rcmail_fix_mimetype($mimetype);
       header("Content-Type: $mimetype");
       header("Content-Transfer-Encoding: binary");

program/steps/mail/show.inc

@@ -173 +173 @@
               JS_OBJECT_NAME,
               $attach_prop->mime_id,
-              $attach_prop->mimetype),
+              rcmail_fix_mimetype($attach_prop->mimetype)),
               'title' => Q($title),
             ),