Skip to content

decoding cyrillic headers encoded in win-1251 and koi8-r #83

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

Closed
rroma wants to merge 2 commits into from
Closed

decoding cyrillic headers encoded in win-1251 and koi8-r #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce4944c
decoding cyrillic headers encoded in win-1251 and koi8-r
rroma Aug 25, 2014
2bd393a
fix cs
rroma Aug 26, 2014
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
27 changes: 26 additions & 1 deletion src/Fetch/Message.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ protected function loadMessage()
return false;

$this->subject = isset($messageOverview->subject) ? $messageOverview->subject : null;
$this->subject = self::decodeHeader($this->subject);
$this->date = strtotime($messageOverview->date);
$this->size = $messageOverview->size;

Expand Down Expand Up @@ -521,6 +522,30 @@ public static function decode($data, $encoding)
}
}

public static function decodeHeader($header, $outEncoding = null)
{
if ($header === null) {
return null;
}

if (!$outEncoding) {
$outEncoding = self::$charset;
}

$header = imap_mime_header_decode($header);

$decoded = '';
for ($i = 0; $i < count($header); $i++) {
if ($header[$i]->charset != 'default') {
$decoded .= iconv($header[$i]->charset, $outEncoding, $header[$i]->text);
} else {
$decoded .= $header[$i]->text;
}
}

return $decoded;
}

/**
* This function returns the body type that an imap integer maps to.
*
Expand Down Expand Up @@ -592,7 +617,7 @@ protected function processAddressObject($addresses)
$currentAddress = array();
$currentAddress['address'] = $address->mailbox . '@' . $address->host;
if (isset($address->personal))
$currentAddress['name'] = $address->personal;
$currentAddress['name'] = self::decodeHeader($address->personal);
$outputAddresses[] = $currentAddress;
}

Expand Down