Changeset 5188

Timestamp:

04/06/2007 02:57:46 AM (19 years ago)

Author:

rob1n

Message:

Add support to wp-mail.php for quoted-printable Content-Transfer-Encoding. Props Nazgul. fixes #2460

File:

• trunk/wp-mail.php (modified) (3 diffs)

trunk/wp-mail.php

@@ -25 +25 @@
     $content = '';
     $content_type = '';
+    $content_transfer_encoding = '';
     $boundary = '';
     $bodysignal = 0;
-    $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-                     'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
+    $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
     foreach ($message as $line) :
         if (strlen($line) < 3) $bodysignal = 1;
@@ -40 +40 @@
                 $content_type = explode(';', $content_type);
                 $content_type = $content_type[0];
+            }
+            if (preg_match('/Content-Transfer-Encoding: /i', $line)) {
+                $content_transfer_encoding = trim($line);
+                $content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding)-14);
+                $content_transfer_encoding = explode(';', $content_transfer_encoding);
+                $content_transfer_encoding = $content_transfer_encoding[0];
             }
             if (($content_type == 'multipart/alternative') && (preg_match('/boundary="/', $line)) && ($boundary == '')) {
@@ -112 +118 @@
     }
     $content = trim($content);
+    
+    if (stripos($content_transfer_encoding, "quoted-printable") !== false) {
+        $content = quoted_printable_decode($content);
+    }
+
     // Captures any text in the body after $phone_delim as the body
     $content = explode($phone_delim, $content);
     $content[1] ? $content = $content[1] : $content = $content[0];
 
-    echo "<p><b>Content-type:</b> $content_type, <b>boundary:</b> $boundary</p>\n";
+    echo "<p><b>Content-type:</b> $content_type, <b>Content-Transfer-Encoding:</b> $content_transfer_encoding, <b>boundary:</b> $boundary</p>\n";
     echo "<p><b>Raw content:</b><br /><pre>".$content.'</pre></p>';