RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2025-02-11 12:39:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from alexkavon/patch-2

Browse Source 
Patch 2
This commit is contained in:
Alex Kavon 2014-06-13 08:52:05 -06:00
commit 90f8f7c53e
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Fetch/Message.php
View File

@ -169,6 +169,14 @@ class Message
*/ */
public static $charset = 'UTF-8'; public static $charset = 'UTF-8';
/**
* This value defines the flag set for encoding if the mb_convert_encoding
* function can't be found. In this case iconv encoding will be used.
*
* @var string
*/
public static $charsetFlag = '//TRANSLIT';
/** /**
* This constructor takes in the uid for the message and the Imap class representing the mailbox the * This constructor takes in the uid for the message and the Imap class representing the mailbox the
* message should be opened from. This constructor should generally not be called directly, but rather retrieved * message should be opened from. This constructor should generally not be called directly, but rather retrieved
@ -437,8 +445,13 @@ class Message
$messageBody = self::decode($messageBody, $structure->encoding); $messageBody = self::decode($messageBody, $structure->encoding);
if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset) if (!empty($parameters['charset']) && $parameters['charset'] !== self::$charset) {
$messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']); if (function_exists('mb_convert_encoding')) {
$messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']);
} else {
$messageBody = iconv($parameters['charset'], self::$charset . self::$charsetFlag, $messageBody);
}
}
if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) { if (strtolower($structure->subtype) === 'plain' || ($structure->type == 1 && strtolower($structure->subtype) !== 'alternative')) {
if (isset($this->plaintextMessage)) { if (isset($this->plaintextMessage)) {