revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 21:02:41 +01:00
Code Issues Releases Wiki Activity

Fix encodings for mime headers and body if not UTF-8

Browse source 
Summary:
If mails are not sent in UTF-8 we cannot just it verbatim, so we have to
encode it into UTF-8 if it is not the case. Mime headers use different
encodings like "quoted-printable", which we have to handle.

It looks like "Subject: =?iso-8859-1?Q?opr=E6t_s=E5_den_task?=", and can
be decoded by ##iconv_mime_decode##.

Furthermore the body of the email might be in various encodings as well,
which we attempt to pull from the content-type header of the plain text
part of the mail.

Test Plan:
Attempted receiving mails in a variety of flavors. These could be
converted to test-cases once i know if this is a sane solution. Got
expected results from mails sent with Windows-1252 and ISO-8859-1.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley, davidreuss

Differential Revision: 1093
This commit is contained in:
David Reuss 2011-12-02 08:47:45 -08:00 committed by epriestley
parent c2054bab09
commit dc0d3f3fef
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/mail/mail_handler.php
View file

@ -35,10 +35,25 @@ phutil_require_module(
$parser = new MimeMailParser(); $parser = new MimeMailParser();
$parser->setText(file_get_contents('php://stdin')); $parser->setText(file_get_contents('php://stdin'));
$text_body = $parser->getMessageBody('text');
$text_body_headers = $parser->getMessageBodyHeaders('text');
$content_type = idx($text_body_headers, 'content-type');
if (
!phutil_is_utf8($text_body) &&
preg_match('/charset="(.*?)"/', $content_type, $matches)
) {
$text_body = mb_convert_encoding($text_body, "UTF-8", $matches[1]);
}
$headers = $parser->getHeaders();
$headers['subject'] = iconv_mime_decode($headers['subject'], 0, "UTF-8");
$headers['from'] = iconv_mime_decode($headers['from'], 0, "UTF-8");
$received = new PhabricatorMetaMTAReceivedMail(); $received = new PhabricatorMetaMTAReceivedMail();
$received->setHeaders($parser->getHeaders()); $received->setHeaders($headers);
$received->setBodies(array( $received->setBodies(array(
'text' => $parser->getMessageBody('text'), 'text' => $text_body,
'html' => $parser->getMessageBody('html'), 'html' => $parser->getMessageBody('html'),
)); ));