Switched to full UTF-8 support

3 files changed, 5 insertions, 15 deletions

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 4c6e56a50..f05193d96 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -21,8 +21,6 @@
 
 require_once('lib/html2text.inc');
 require_once('lib/enriched.inc');
-require_once('lib/utf8.inc');
-require_once('lib/utf7.inc');
 
 
 $EMAIL_ADDRESS_PATTERN = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/i';
@@ -148,7 +146,7 @@ function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='')
   if (!isset($arrFolders[$currentFolder]))
     {
     $arrFolders[$currentFolder] = array('id' => $path,
-                                        'name' => UTF7DecodeString($currentFolder),
+                                        'name' => rcube_charset_convert($currentFolder, 'UTF-7'),
                                         'folders' => array());
     }
 
@@ -174,7 +172,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlen
       $foldername = rcube_label($folder_lc);
     else
       {
-      $foldername = $OUTPUT->encode_string($folder['name']);
+      $foldername = $folder['name'];
 
       // shorten the folder name to a given length
       if ($maxlength && $maxlength>1)
@@ -242,7 +240,7 @@ function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxl
       $foldername = rcube_label($folder_lc);
     else
       {
-      $foldername = $OUTPUT->encode_string($folder['name']);
+      $foldername = $folder['name'];
       
       // shorten the folder name to a given length
       if ($maxlength && $maxlength>1)
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index ee278189a..ab0c6ed07 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -80,9 +80,6 @@ if (empty($CHARSET))
 $input_charset = $CHARSET;
 $message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $input_charset;
 
-// unset global var
-$CHARSET = '';
-
 $mailto_regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m');
 $mailto_replace = array(', ', ', ', '');
 
@@ -243,9 +240,6 @@ else
   }
 
 
-// resore page charset
-$CHARSET = $input_charset;
-
 // return to compose page if sending failed
 if (!$sent)
   {
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 0702ce91d..c98de3951 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -19,8 +19,6 @@
 
 */
 
-require_once('lib/utf7.inc');
-
 // init IAMP connection
 rcmail_imap_init(TRUE);
 
@@ -53,7 +51,7 @@ else if ($_action=='create-folder')
 
   if ($create && $_GET['_remote'])
     {
-    $commands = sprintf("this.add_folder_row('%s')", $OUTPUT->encode_string(rep_specialchars_output($create, 'js')));
+    $commands = sprintf("this.add_folder_row('%s')", rep_specialchars_output($create, 'js'));
     rcube_remote_response($commands);
     }
   else if (!$create && $_GET['_remote'])
@@ -129,7 +127,7 @@ function rcube_subscription_form($attrib)
     $out .= sprintf('<tr id="rcmrow%d" class="%s"><td>%s</td><td>%s</td><td><a href="#delete" onclick="%s.command(\'delete-folder\',\'%s\')" title="%s">%s</a></td>',
                     $i+1,
                     $zebra_class,
-                    $OUTPUT->encode_string(rep_specialchars_output(UTF7DecodeString($folder), 'html', 'all')),
+                    rep_specialchars_output(rcube_charset_convert($folder, 'UTF-7', 'UTF-8'), 'html', 'all'),
                     $checkbox_subscribe->show(in_array($folder, $a_subscribed)?$folder:'', array('value' => $folder)),
                     $JS_OBJECT_NAME,
                     $folder_js,