summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_charset.php20
-rw-r--r--program/include/rcube_ui.php4
2 files changed, 12 insertions, 12 deletions
diff --git a/program/include/rcube_charset.php b/program/include/rcube_charset.php
index 7e8fe4997..47d855d1a 100644
--- a/program/include/rcube_charset.php
+++ b/program/include/rcube_charset.php
@@ -44,14 +44,14 @@ class rcube_charset
'UNKNOWN' => 'ISO-8859-15',
'USERDEFINED' => 'ISO-8859-15',
'KSC56011987' => 'EUC-KR',
- 'GB2312' => 'GBK',
- 'GB231280' => 'GBK',
- 'UNICODE' => 'UTF-8',
- 'UTF7IMAP' => 'UTF7-IMAP',
- 'TIS620' => 'WINDOWS-874',
- 'ISO88599' => 'WINDOWS-1254',
- 'ISO885911' => 'WINDOWS-874',
- 'MACROMAN' => 'MACINTOSH',
+ 'GB2312' => 'GBK',
+ 'GB231280' => 'GBK',
+ 'UNICODE' => 'UTF-8',
+ 'UTF7IMAP' => 'UTF7-IMAP',
+ 'TIS620' => 'WINDOWS-874',
+ 'ISO88599' => 'WINDOWS-1254',
+ 'ISO885911' => 'WINDOWS-874',
+ 'MACROMAN' => 'MACINTOSH',
'77' => 'MAC',
'128' => 'SHIFT-JIS',
'129' => 'CP949',
@@ -336,7 +336,7 @@ class rcube_charset
break;
}
- $ch .= $u7;
+ $ch .= $u7;
}
if ($ch == '') {
@@ -724,7 +724,7 @@ class rcube_charset
}
else if ($ord >= 0xC0) {
if (strlen($seq) > 1) {
- $out .= preg_match($regexp, $seq) ? $seq : '';
+ $out .= preg_match($regexp, $seq) ? $seq : '';
$seq = '';
}
else if ($seq && ord($seq) < 0xC0) {
diff --git a/program/include/rcube_ui.php b/program/include/rcube_ui.php
index 96d686a7b..833a1dfde 100644
--- a/program/include/rcube_ui.php
+++ b/program/include/rcube_ui.php
@@ -829,7 +829,7 @@ class rcube_ui
/**
* Return html for a structured list &lt;ul&gt; for the mailbox tree
*/
- private static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
+ public static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
{
global $RCMAIL;
@@ -922,7 +922,7 @@ class rcube_ui
/**
* Return html for a flat list <select> for the mailbox tree
*/
- private static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
+ public static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
{
global $RCMAIL;