Mime-part parsing: fixed edge cases

Author: jkuchar

MailLibrary/Drivers/ImapDriver.php

@@ -314,16 +314,26 @@ public function getBody($mailId, array $data)
 			if($dataMessage === FALSE) {
 				throw new DriverException("Cannot read given message part - " . error_get_last()["message"]);
 			}
-			$encoding = $part['encoding'];
-			if($encoding === ImapStructure::ENCODING_BASE64) {
-				$dataMessage = base64_decode($dataMessage);
-			} else if($encoding === ImapStructure::ENCODING_QUOTED_PRINTABLE) {
-				$dataMessage = quoted_printable_decode($dataMessage);
-			}
 
-			// todo: other encodings?
+			// when there is no encoding of mime part available
+			if(!isset($part['encoding'])) {
+				$decodedMessage = $dataMessage;
+
+			} elseif($part['encoding'] === ImapStructure::ENCODING_BASE64) {
+				$decodedMessage = base64_decode($dataMessage);
+				if($decodedMessage === FALSE) {
+					throw new DriverException('Malformed mime-part: cannot decode base64 mime-part');
+				}
+
+			} elseif($part['encoding'] === ImapStructure::ENCODING_QUOTED_PRINTABLE) {
+				$decodedMessage = quoted_printable_decode($dataMessage);
+
+			} else {
+				throw new DriverException("Mime-part reading error: unknown encoding ({$part['encoding']})");
+
+			}
 
-			$body[] = $dataMessage;
+			$body[] = $decodedMessage;
 		}
 		return implode('\n\n', $body);
 	}