From a786b0b268ff1ce0963bc2ea5dfdd58652d61be3 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Fri, 11 Oct 2013 20:27:40 +0000
Subject: [PATCH] Support incorrectly labeled us-ascii charsets
Some email clients (names omitted to protect the innocent) advertise the
encoding as us-ascii when iso-8859-1 was really implied. This patch allows
the two charsets to be interchangable.
---
include/class.format.php | 4 ++--
include/class.mailfetch.php | 14 +++++++++-----
include/class.mailparse.php | 5 +++--
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/include/class.format.php b/include/class.format.php
index f016896de..6a878f6f2 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -43,10 +43,10 @@ class Format {
// Cleanup - incorrect, bogus, or ambiguous charsets
if($charset && in_array(strtolower(trim($charset)),
- array('default','x-user-defined','iso')))
+ array('default','x-user-defined','iso','us-ascii')))
$charset = 'ISO-8859-1';
- if (strcasecmp($charset, $encoding) === 0)
+ if ($charset && strcasecmp($charset, $encoding) === 0)
return $text;
$original = $text;
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index 2e5089a57..82da3e7f4 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -304,12 +304,16 @@ class MailFetcher {
$text=$this->decode($text, $struct->encoding);
$charset=null;
- if($encoding) { //Convert text to desired mime encoding...
- if($struct->ifparameters) {
- if(!strcasecmp($struct->parameters[0]->attribute,'CHARSET') && strcasecmp($struct->parameters[0]->value,'US-ASCII'))
- $charset=trim($struct->parameters[0]->value);
+ if ($encoding) { //Convert text to desired mime encoding...
+ if ($struct->ifparameters && $struct->parameters) {
+ foreach ($struct->parameters as $p) {
+ if (!strcasecmp($p->attribute, 'charset')) {
+ $charset = trim($p->value);
+ break;
+ }
+ }
}
- $text=$this->mime_encode($text, $charset, $encoding);
+ $text = $this->mime_encode($text, $charset, $encoding);
}
return $text;
}
diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 039a48b74..6a9cd1a89 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -177,8 +177,9 @@ class Mail_Parse {
if($ctype && strcasecmp($ctype,$ctypepart)==0) {
$content = $struct->body;
//Encode to desired encoding - ONLY if charset is known??
- if(isset($struct->ctype_parameters['charset']) && strcasecmp($struct->ctype_parameters['charset'], $this->charset))
- $content = Format::encode($content, $struct->ctype_parameters['charset'], $this->charset);
+ if (isset($struct->ctype_parameters['charset']))
+ $content = Format::encode($content,
+ $struct->ctype_parameters['charset'], $this->charset);
return $content;
}
--
GitLab