From 2b13adc5b3415362e4267e78fe811b1d4884e0c6 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 20 Nov 2013 10:41:12 -0600
Subject: [PATCH] email: Accept inline body with disposition params
A mail client may indicate a header parameter (such as Novell Groupwise,
which may add something like
Content-Disposition: inline; modification-time: "Thu ..."
) Previously, the system would not consider the content to be a candidate
for the email body, because it has parameters to the content-disposition
header.
This patch will still consider the part to be a candidate for the body if
the mime types match and no filename is found in the content-disposition
parameters.
---
include/class.mailfetch.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 9bf51bc9f..fc1560e43 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -297,7 +297,11 @@ class MailFetcher {
$struct=@imap_fetchstructure($this->mbox, $mid);
//Match the mime type.
- if($struct && !$struct->ifdparameters && strcasecmp($mimeType, $this->getMimeType($struct))==0) {
+ if($struct
+ && strcasecmp($mimeType, $this->getMimeType($struct))==0
+ && (!$struct->ifdparameters
+ || !$this->findFilename($struct->dparameters))) {
+
$partNumber=$partNumber?$partNumber:1;
if(($text=imap_fetchbody($this->mbox, $mid, $partNumber))) {
if($struct->encoding==3 or $struct->encoding==4) //base64 and qp decode.
--
GitLab