RetailCRM-Mirror/Fetch
1
0
Fork 0
mirror of https://github.com/retailcrm/Fetch.git synced 2024-11-22 19:26:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88 from Xethron/catch-mb_convert_encoding-exceptions

Browse Source 
Catch mb convert encoding exceptions
This commit is contained in:
Robert Hafner 2014-09-24 23:44:51 -07:00
commit 501d5d0974
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Fetch/Message.php
View File

@ -10,6 +10,7 @@
*/ */
namespace Fetch; namespace Fetch;
use Exception;
/** /**
* This library is a wrapper around the Imap library functions included in php. This class represents a single email * This library is a wrapper around the Imap library functions included in php. This class represents a single email
@ -465,10 +466,21 @@ 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) {
$mb_converted = false;
if (function_exists('mb_convert_encoding')) { if (function_exists('mb_convert_encoding')) {
try {
$messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']); $messageBody = mb_convert_encoding($messageBody, self::$charset, $parameters['charset']);
} else { $mb_converted = true;
} catch (Exception $e) {
// @TODO Handle exception
}
}
if (!$mb_converted) {
try {
$messageBody = iconv($parameters['charset'], self::$charset . self::$charsetFlag, $messageBody); $messageBody = iconv($parameters['charset'], self::$charset . self::$charsetFlag, $messageBody);
} catch (Exception $e) {
// @TODO Handle exception
}
} }
} }