From 1b61a48eecb395262e0c31a019b06604a95110b6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 22 Sep 2015 15:18:15 -0400
Subject: [PATCH] Get rid of mb_check_encoding() before mb_convert_encoding() for better performance, CS fixes
---
program/lib/Roundcube/rcube_charset.php | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php
index beb2134..9d5d55e 100644
--- a/program/lib/Roundcube/rcube_charset.php
+++ b/program/lib/Roundcube/rcube_charset.php
@@ -70,8 +70,8 @@
/**
* Catch an error and throw an exception.
*
- * @param int Level of the error
- * @param string Error message
+ * @param int $errno Level of the error
+ * @param string $errstr Error message
*/
public static function error_handler($errno, $errstr)
{
@@ -162,19 +162,19 @@
* Convert a string from one charset to another.
* Uses mbstring and iconv functions if possible
*
- * @param string Input string
- * @param string Suspected charset of the input string
- * @param string Target charset to convert to; defaults to RCUBE_CHARSET
+ * @param string $str Input string
+ * @param string $from Suspected charset of the input string
+ * @param string $to Target charset to convert to; defaults to RCUBE_CHARSET
*
* @return string Converted string
*/
public static function convert($str, $from, $to = null)
{
- static $iconv_options = null;
- static $mbstring_list = null;
- static $mbstring_sch = null;
+ static $iconv_options = null;
+ static $mbstring_list = null;
+ static $mbstring_sch = null;
- $to = empty($to) ? RCUBE_CHARSET : $to;
+ $to = empty($to) ? RCUBE_CHARSET : strtoupper($to);
$from = self::parse_charset($from);
// It is a common case when UTF-16 charset is used with US-ASCII content (#1488654)
@@ -208,7 +208,8 @@
set_error_handler(array('rcube_charset', 'error_handler'), E_NOTICE);
try {
$out = iconv($from, $to . $iconv_options, $str);
- } catch (ErrorException $e) {
+ }
+ catch (ErrorException $e) {
$out = false;
}
restore_error_handler();
@@ -242,15 +243,24 @@
// return if encoding found, string matches encoding and convert succeeded
if (in_array($mb_from, $mbstring_list) && in_array($mb_to, $mbstring_list)) {
- if (mb_check_encoding($str, $mb_from)) {
- // Do the same as //IGNORE with iconv
- mb_substitute_character('none');
- $out = mb_convert_encoding($str, $mb_to, $mb_from);
- mb_substitute_character($mbstring_sch);
+ // Do the same as //IGNORE with iconv
+ mb_substitute_character('none');
- if ($out !== false) {
- return $out;
- }
+ // throw an exception if mbstring reports an illegal character in input
+ // using mb_check_encoding() is much slower
+ set_error_handler(array('rcube_charset', 'error_handler'), E_WARNING);
+ try {
+ $out = mb_convert_encoding($str, $mb_to, $mb_from);
+ }
+ catch (ErrorException $e) {
+ $out = false;
+ }
+ restore_error_handler();
+
+ mb_substitute_character($mbstring_sch);
+
+ if ($out !== false) {
+ return $out;
}
}
}
--
Gitblit v1.9.1