Commit 20b2f819 authored by YANO Takashi's avatar YANO Takashi

ZP-1202 Part of subject or from may be in junk string. Released under the...

ZP-1202 Part of subject or from may be in junk string. Released under the Affero GNU General Public License (AGPL) version 3.
parent 62379821
...@@ -1187,16 +1187,20 @@ class Utils { ...@@ -1187,16 +1187,20 @@ class Utils {
if ( !isset($nonencstr) ) { if ( !isset($nonencstr) ) {
return $utf8str; return $utf8str;
} }
// if php-imap option is not installed, there is no noconversion
if ( !function_exists("imap_mime_header_decode") ) {
return $utf8str;
}
$isiso2022jp = false; $isiso2022jp = false;
$str = ""; $str = "";
foreach ( imap_mime_header_decode($nonencstr) as $val ) { foreach ( @imap_mime_header_decode($nonencstr) as $val ) {
if ( strtolower($val->charset) == "iso-2022-jp" ) { if ( strtolower($val->charset) == "iso-2022-jp" ) {
$isiso2022jp = true; $isiso2022jp = true;
$str .= mb_convert_encoding($val->text, "utf-8", "ISO-2022-JP-MS"); $str .= @mb_convert_encoding($val->text, "utf-8", "ISO-2022-JP-MS");
} else if ( strtolower($val->charset) == "default" ) { } else if ( strtolower($val->charset) == "default" ) {
$str .= $val->text; $str .= $val->text;
} else { } else {
$str .= mb_convert_encoding($val->text, "utf-8", $val->charset); $str .= @mb_convert_encoding($val->text, "utf-8", $val->charset);
} }
} }
if ( !$isiso2022jp ) { if ( !$isiso2022jp ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment