Additional Attachment name fallback added to prevent missing attachments

Webklex · Jun 28, 2023 · b8484ba · b8484ba
1 parent 141dc10
commit b8484ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Attachment.php b/src/Attachment.php
@@ -243,9 +243,6 @@ protected function fetch(): void {
         if (($name = $this->part->name) !== null) {
             $this->name = $this->decodeName($name);
         }
-        if (!$this->name && $this->filename != "") {
-            $this->name = $this->filename;
-        }
 
         if (IMAP::ATTACHMENT_TYPE_MESSAGE == $this->part->type) {
             if ($this->part->ifdescription) {
@@ -258,8 +255,12 @@ protected function fetch(): void {
         }
         $this->attributes = array_merge($this->part->getHeader()->getAttributes(), $this->attributes);
 
-        if(!$this->filename){
-            $this->filename = bin2hex(random_bytes(10));
+        if (!$this->filename) {
+            $this->filename = $this->hash;
+        }
+
+        if (!$this->name && $this->filename != "") {
+            $this->name = $this->filename;
         }
     }
 

diff --git a/src/Message.php b/src/Message.php
@@ -767,7 +767,7 @@ protected function addBody(string $subtype, string $content): void {
     protected function fetchAttachment(Part $part): void {
         $oAttachment = new Attachment($this, $part);
 
-        if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) {
+        if ($oAttachment->getSize() > 0) {
             if ($oAttachment->getId() !== null && $this->attachments->offsetExists($oAttachment->getId())) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
             } else {