Replace embedded image with URL #151

Author: Webklex

src/IMAP/Attachment.php

@@ -176,10 +176,6 @@ protected function fetch() {
                 }
             }
         }
-
-        if ($this->type == 'image') {
-            $this->img_src = 'data:'.$this->content_type.';base64,'.base64_encode($this->content);
-        }
     }
 
     /**
@@ -256,6 +252,9 @@ public function getDisposition() {
      * @return null|string
      */
     public function getImgSrc() {
+        if ($this->type == 'image' && $this->img_src == null) {
+            $this->img_src = 'data:'.$this->content_type.';base64,'.base64_encode($this->content);
+        }
         return $this->img_src;
     }
 

src/IMAP/Message.php

@@ -280,8 +280,9 @@ public function getHTMLBody($replaceImages = false) {
         $body = $this->bodies['html']->content;
         if ($replaceImages) {
             $this->attachments->each(function($oAttachment) use(&$body) {
-                if ($oAttachment->id && isset($oAttachment->img_src)) {
-                    $body = str_replace('cid:'.$oAttachment->id, $oAttachment->img_src, $body);
+                /** @var Attachment $oAttachment */
+                if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
+                    $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body);
                 }
             });
         }
@@ -801,6 +802,7 @@ public function getEncoding($structure) {
      *
      * @return null|Folder
      * @throws Exceptions\ConnectionFailedException
+     * @throws InvalidMessageDateException
      */
     public function getContainingFolder(Folder $folder = null) {
         $folder = $folder ?: $this->client->getFolders()->first();