569: Fix broken inline images when header does not contain "Content-Disposition: inline"

Author: Sebastian Krätzig

src/PhpImap/IncomingMail.php

@@ -219,7 +219,11 @@ public function embedImageAttachments(): void
                 $cid = \str_replace('cid:', '', $match);
 
                 foreach ($attachments as $attachment) {
-                    if ($attachment->contentId == $cid && 'inline' == \mb_strtolower((string) $attachment->disposition)) {
+                    /**
+                     * Inline images can contain a "Content-Disposition: inline", but only a "Content-ID" is also enough.
+                     * See https://github.com/barbushin/php-imap/issues/569
+                     */
+                    if ($attachment->contentId == $cid || 'inline' == \mb_strtolower((string) $attachment->disposition)) {
                         $contents = $attachment->getContents();
                         $contentType = (string) $attachment->getFileInfo(FILEINFO_MIME);
 

src/PhpImap/Mailbox.php

@@ -1636,7 +1636,7 @@ protected function initMailPart(IncomingMail $mail, object $partStructure, $part
             }
         }
 
-        $isAttachment = isset($params['filename']) || isset($params['name']);
+        $isAttachment = isset($params['filename']) || isset($params['name']) || isset($partStructure->id);
 
         $dispositionAttachment = (
             isset($partStructure->disposition) &&