Attachment detection updated #82 #90

Webklex · Jan 19, 2021 · de50ce3 · de50ce3
1 parent 22a33f4
commit de50ce3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,13 +6,15 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [UNRELEASED]
 ### Fixed
+- Attachment detection updated #82 #90
 - Timeout handling improved
 
 ### Added
 - Auto reconnect option added to `Folder::idle()` #89
 
 ### Affected Classes
 - [Folder::class](src/Folder.php)
+- [Part::class](src/Part.php)
 - [Client::class](src/Client.php)
 
 ### Breaking changes

diff --git a/src/Part.php b/src/Part.php
@@ -299,11 +299,8 @@ private function parseEncoding(){
      * @return bool
      */
     public function isAttachment(){
-        if ($this->type == IMAP::MESSAGE_TYPE_TEXT &&
-            ($this->ifdisposition == 0 ||
-                (empty($this->disposition) || !in_array(strtolower($this->disposition), ClientManager::get('options.dispositions')))
-            )
-        ) {
+        $valid_disposition = in_array(strtolower($this->disposition), ClientManager::get('options.dispositions'));
+        if ($this->type == IMAP::MESSAGE_TYPE_TEXT && ($this->ifdisposition == 0 || (empty($this->disposition))) && !$valid_disposition) {
             if (($this->subtype == null || in_array((strtolower($this->subtype)), ["plain", "csv", "html"])) && $this->filename == null && $this->name == null) {
                 return false;
             }