From 2965a981b7ec22866fbdf2d567d87e2d068d3617 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 31 Jul 2015 16:04:08 -0400
Subject: [PATCH] Allow to search and import missing PGP pubkeys from keyservers using Publickey.js
---
program/lib/Roundcube/rcube_charset.php | 97 +++++++++++++++++++++++++++---------------------
1 files changed, 54 insertions(+), 43 deletions(-)
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php
index d6ca3c0..048961a 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);
@@ -274,7 +273,7 @@
return utf8_encode($str);
}
else {
- user_error("No suitable function found for UTF-8 encoding", E_USER_WARNING);
+ trigger_error("No suitable function found for UTF-8 encoding");
}
}
@@ -290,7 +289,7 @@
return utf8_decode($str);
}
else {
- user_error("No suitable function found for UTF-8 decoding", E_USER_WARNING);
+ trigger_error("No suitable function found for UTF-8 decoding");
}
}
@@ -654,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',
@@ -695,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
@@ -741,7 +753,7 @@
// iconv/mbstring are much faster (especially with long strings)
if (function_exists('mb_convert_encoding')) {
- $msch = mb_substitute_character('none');
+ $msch = mb_substitute_character();
mb_substitute_character('none');
$res = mb_convert_encoding($input, 'UTF-8', 'UTF-8');
mb_substitute_character($msch);
@@ -777,30 +789,29 @@
// 1-byte character
if ($ord <= 0x7F) {
- if ($seq) {
+ if ($seq !== '') {
$out .= preg_match($regexp, $seq) ? $seq : '';
+ $seq = '';
}
- $seq = '';
+
$out .= $chr;
}
- // first (or second) byte of multibyte sequence
+ // first byte of multibyte sequence
else if ($ord >= 0xC0) {
- if (strlen($seq) > 1) {
+ if ($seq !== '') {
$out .= preg_match($regexp, $seq) ? $seq : '';
$seq = '';
}
- else if ($seq && ord($seq) < 0xC0) {
- $seq = '';
- }
- $seq .= $chr;
+
+ $seq = $chr;
}
// next byte of multibyte sequence
- else if ($seq) {
+ else if ($seq !== '') {
$seq .= $chr;
}
}
- if ($seq) {
+ if ($seq !== '') {
$out .= preg_match($regexp, $seq) ? $seq : '';
}
--
Gitblit v1.9.1