Fall back to attachment name from content type if it's not set in content-disposition

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

1 files changed, 3 insertions, 7 deletions

diff --git a/lib/Attachment.php b/lib/Attachment.php
index 768beed63..abec4a05f 100644
--- a/lib/Attachment.php
+++ b/lib/Attachment.php
@@ -74,6 +74,7 @@ class Attachment {
 			throw new DoesNotExistException('Unable to load the attachment.');
 		}
 		$fetch = $headers[$this->messageId];
+		/** @var \Horde_Mime_Headers $mimeHeaders */
 		$mimeHeaders = $fetch->getMimeHeader($this->attachmentId, Horde_Imap_Client_Data_Fetch::HEADER_PARSE);
 
 		$this->mimePart = new \Horde_Mime_Part();
@@ -87,13 +88,8 @@ class Attachment {
 
 		// Extract headers from part
 		$contentDisposition = $mimeHeaders->getValue('content-disposition', \Horde_Mime_Headers::VALUE_PARAMS);
-		if (!is_null($contentDisposition)) {
-			$vars = ['filename'];
-			foreach ($contentDisposition as $key => $val) {
-				if(in_array($key, $vars)) {
-					$this->mimePart->setDispositionParameter($key, $val);
-				}
-			}
+		if (!is_null($contentDisposition) && isset($contentDisposition['filename'])) {
+			$this->mimePart->setDispositionParameter('filename', $contentDisposition['filename']);
 		} else {
 			$contentDisposition = $mimeHeaders->getValue('content-type', \Horde_Mime_Headers::VALUE_PARAMS);
 			$vars = ['name'];