Bugfix/message structure disposition (#256)

girvydas · Webklex · commit 74245b4d4fd4 · 2019-10-09T16:35:14.000+02:00
* Fix windows-1257 to utf-8 encoding Encode strings with iconv if possible. * Fetch message structure - check if disposition exists. Closes #253
diff --git a/src/IMAP/Message.php b/src/IMAP/Message.php
@@ -718,7 +718,7 @@ private function fetchStructure($structure, $partNumber = null) {
                 $body->content = $content;
 
                 $this->bodies['html'] = $body;
-            } elseif (strtolower($structure->disposition) == 'attachment') {
+            } elseif ($structure->ifdisposition == 1 && strtolower($structure->disposition) == 'attachment') {
                 if ($this->getFetchAttachmentOption() === true) {
                     $this->fetchAttachment($structure, $partNumber);
                 }

Original file line number	Diff line number	Diff line change
`@@ -718,7 +718,7 @@ private function fetchStructure($structure, $partNumber = null) {`
`718`	`718`	`$body->content = $content;`
`719`	`719`
`720`	`720`	`$this->bodies['html'] = $body;`
`721`		`- } elseif (strtolower($structure->disposition) == 'attachment') {`
	`721`	`+ } elseif ($structure->ifdisposition == 1 && strtolower($structure->disposition) == 'attachment') {`
`722`	`722`	`if ($this->getFetchAttachmentOption() === true) {`
`723`	`723`	`$this->fetchAttachment($structure, $partNumber);`
`724`	`724`	`}`