From 6c705bd335eafd22bcb85a930ccbeee1a7e539e4 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 29 May 2014 14:11:21 -0500
Subject: [PATCH] oops: Fix decoding of piped email attach file names
---
include/class.mailparse.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index d498a77f7..50f15f3e6 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -365,7 +365,7 @@ class Mail_Parse {
|| !strcasecmp($part->ctype_primary,'application')))) {
if (isset($part->d_parameters['filename']))
- $filename = $part->d_parameters['filename'];
+ $filename = Format::mimedecode($part->d_parameters['filename'], $this->charset);
elseif (isset($part->d_parameters['filename*']))
// Support RFC 6266, section 4.3 and RFC, and RFC 5987
$filename = Format::decodeRfc5987(
@@ -374,7 +374,7 @@ class Mail_Parse {
// Support attachments that do not specify a content-disposition
// but do specify a "name" parameter in the content-type header.
elseif (isset($part->ctype_parameters['name']))
- $filename = $part->ctype_parameters['name'];
+ $filename = Format::mimedecode($part->ctype_parameters['name'], $this->charset);
elseif (isset($part->ctype_parameters['name*']))
$filename = Format::decodeRfc5987(
$part->ctype_parameters['name*']);
--
GitLab