Cleanup

sofianarifianto · Aug 11, 2014 · e6a20a6 · e6a20a6
1 parent 428c981
commit e6a20a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/changelog.md b/changelog.md
@@ -13,6 +13,7 @@
 * Improve PCRE detection in older PHP versions
 * Handle debug output consistently, and always in UTF-8
 * Allow user-defined debug output method via a callable
+* msgHTML now converts data URIs to embedded images
 
 ## Version 5.2.8 (May 14th 2014)
 * Increase timeout to match RFC2821 section 4.5.3.2 and thus not fail greetdelays, fixes #104

diff --git a/class.phpmailer.php b/class.phpmailer.php
@@ -2892,25 +2892,24 @@ public function msgHTML($message, $basedir = '', $advanced = false)
         preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
         if (isset($images[2])) {
             foreach ($images[2] as $imgindex => $url) {
-                // convert data: uri's into embedded images
-				if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
-					$data = substr($url, strpos($url, ','));
-					if ($match[2]) {
-						$data = base64_decode($data);
-					} else { 
-						$data = rawurldecode($data);
-					}
-					$cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-					if ( $this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1]) ) {
+                // Convert data URIs into embedded images
+                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
+                    $data = substr($url, strpos($url, ','));
+                    if ($match[2]) {
+                        $data = base64_decode($data);
+                    } else {
+                        $data = rawurldecode($data);
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
                         $message = preg_replace(
                             '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
                             $images[1][$imgindex] . '="cid:' . $cid . '"',
                             $message
                         );
-					}
-				} else
-                // do not change urls for absolute images (thanks to corvuscorax)
-                if (!preg_match('#^[A-z]+://#', $url)) {
+                    }
+                } elseif (!preg_match('#^[A-z]+://#', $url)) {
+                    // Do not change urls for absolute images (thanks to corvuscorax)
                     $filename = basename($url);
                     $directory = dirname($url);
                     if ($directory == '.') {