From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names
---
program/lib/Roundcube/rcube_charset.php | 109 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 55 deletions(-)
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php
index 8612e7f..3657626 100644
--- a/program/lib/Roundcube/rcube_charset.php
+++ b/program/lib/Roundcube/rcube_charset.php
@@ -175,7 +175,6 @@
static $iconv_options = null;
static $mbstring_list = null;
static $mbstring_sch = null;
- static $conv = null;
$to = empty($to) ? RCUBE_CHARSET : $to;
$from = self::parse_charset($from);
@@ -273,17 +272,8 @@
else if ($from == 'ISO-8859-1' && function_exists('utf8_encode')) {
return utf8_encode($str);
}
- else if (class_exists('utf8')) {
- if (!$conv) {
- $conv = new utf8($from);
- }
- else {
- $conv->loadCharset($from);
- }
-
- if ($_str = $conv->strToUtf8($str)) {
- return $_str;
- }
+ else {
+ trigger_error("No suitable function found for UTF-8 encoding");
}
}
@@ -298,17 +288,8 @@
else if ($to == 'ISO-8859-1' && function_exists('utf8_decode')) {
return utf8_decode($str);
}
- else if (class_exists('utf8')) {
- if (!$conv) {
- $conv = new utf8($to);
- }
- else {
- $conv->loadCharset($from);
- }
-
- if ($_str = $conv->strToUtf8($str)) {
- return $_str;
- }
+ else {
+ trigger_error("No suitable function found for UTF-8 decoding");
}
}
@@ -672,36 +653,47 @@
if ($string[0] == "\0" && $string[1] != "\0" && $string[2] == "\0" && $string[3] != "\0") return 'UTF-16BE';
if ($string[0] != "\0" && $string[1] == "\0" && $string[2] != "\0" && $string[3] == "\0") return 'UTF-16LE';
- if (function_exists('mb_detect_encoding')) {
- if (empty($language)) {
- $rcube = rcube::get_instance();
- $language = $rcube->get_user_language();
+ if (empty($language)) {
+ $rcube = rcube::get_instance();
+ $language = $rcube->get_user_language();
+ }
+
+ // Prioritize charsets according to current language (#1485669)
+ switch ($language) {
+ case 'ja_JP':
+ $prio = array('ISO-2022-JP', 'JIS', 'UTF-8', 'EUC-JP', 'eucJP-win', 'SJIS', 'SJIS-win');
+ break;
+
+ case 'zh_CN':
+ case 'zh_TW':
+ $prio = array('UTF-8', 'BIG-5', 'GB2312', 'EUC-TW');
+ break;
+
+ case 'ko_KR':
+ $prio = array('UTF-8', 'EUC-KR', 'ISO-2022-KR');
+ break;
+
+ case 'ru_RU':
+ $prio = array('UTF-8', 'WINDOWS-1251', 'KOI8-R');
+ break;
+
+ case 'tr_TR':
+ $prio = array('UTF-8', 'ISO-8859-9', 'WINDOWS-1254');
+ break;
+ }
+
+ // mb_detect_encoding() is not reliable for some charsets (#1490135)
+ // use mb_check_encoding() to make charset priority lists really working
+ if ($prio && function_exists('mb_check_encoding')) {
+ foreach ($prio as $encoding) {
+ if (mb_check_encoding($string, $encoding)) {
+ return $encoding;
+ }
}
+ }
- // Prioritize charsets according to current language (#1485669)
- switch ($language) {
- case 'ja_JP':
- $prio = array('ISO-2022-JP', 'JIS', 'UTF-8', 'EUC-JP', 'eucJP-win', 'SJIS', 'SJIS-win');
- break;
-
- case 'zh_CN':
- case 'zh_TW':
- $prio = array('UTF-8', 'BIG-5', 'GB2312', 'EUC-TW');
- break;
-
- case 'ko_KR':
- $prio = array('UTF-8', 'EUC-KR', 'ISO-2022-KR');
- break;
-
- case 'ru_RU':
- $prio = array('UTF-8', 'WINDOWS-1251', 'KOI8-R');
- break;
-
- case 'tr_TR':
- $prio = array('UTF-8', 'ISO-8859-9', 'WINDOWS-1254');
- break;
-
- default:
+ if (function_exists('mb_detect_encoding')) {
+ if (!$prio) {
$prio = array('UTF-8', 'SJIS', 'GB2312',
'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
@@ -713,7 +705,9 @@
$encodings = array_unique(array_merge($prio, mb_list_encodings()));
- return mb_detect_encoding($string, $encodings);
+ if ($encoding = mb_detect_encoding($string, $encodings)) {
+ return $encoding;
+ }
}
// No match, check for UTF-8
@@ -759,7 +753,12 @@
// iconv/mbstring are much faster (especially with long strings)
if (function_exists('mb_convert_encoding')) {
- if (($res = mb_convert_encoding($input, 'UTF-8', 'UTF-8')) !== false) {
+ $msch = mb_substitute_character('none');
+ mb_substitute_character('none');
+ $res = mb_convert_encoding($input, 'UTF-8', 'UTF-8');
+ mb_substitute_character($msch);
+
+ if ($res !== false) {
return $res;
}
}
@@ -795,8 +794,8 @@
}
$seq = '';
$out .= $chr;
- // first (or second) byte of multibyte sequence
}
+ // first (or second) byte of multibyte sequence
else if ($ord >= 0xC0) {
if (strlen($seq) > 1) {
$out .= preg_match($regexp, $seq) ? $seq : '';
@@ -806,8 +805,8 @@
$seq = '';
}
$seq .= $chr;
- // next byte of multibyte sequence
}
+ // next byte of multibyte sequence
else if ($seq) {
$seq .= $chr;
}
--
Gitblit v1.9.1