Skip to content

Minor enhancement and a bugfix. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MyHammerOpenSource wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor enhancement and a bugfix. #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions PlancakeEmailParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,18 @@ public function getBody($returnType=self::PLAINTEXT)

if (!$detectedContentType)
{
// check if contentTransferEncoding was set -> if not, read its value from header
if (!$contentTransferEncoding) {
$contentTransferEncoding = $this->rawFields['content-transfer-encoding'];
}

// check if charset was set in header -> if not, use deafult (as already set in $charset)
preg_match('/charset=(.*)/i', $this->rawFields['content-type'], $matches);
$charsetFromHeader = strtoupper(trim($matches[1], '"'));
if ($charsetFromHeader) {
$charset = $charsetFromHeader;
}

// if here, we missed the text/plain content-type (probably it was
// in the header), thus we assume the whole body is what we are after
$body = implode("\n", $this->rawBodyLines);
Expand All @@ -262,16 +274,18 @@ public function getBody($returnType=self::PLAINTEXT)
else if ($contentTransferEncoding == 'quoted-printable')
$body = quoted_printable_decode($body);

if($charset != 'UTF-8') {
if ($charset != 'UTF-8') {
// FORMAT=FLOWED, despite being popular in emails, it is not
// supported by iconv
$charset = str_replace("FORMAT=FLOWED", "", $charset);

$body = iconv($charset, 'UTF-8//TRANSLIT', $body);
if ($body === FALSE) { // iconv returns FALSE on failure
$body = utf8_encode($body);
$iconvBody = iconv($charset, 'UTF-8//TRANSLIT', $body);

if ($iconvBody === FALSE) { // iconv returns FALSE on failure
return utf8_encode($body);
}

return $iconvBody;
}

return $body;
Expand Down