From 3f9edb4c3ec29b5b807d99da479333b62a406686 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 13 Jan 2006 17:14:38 +0000
Subject: Switched to full UTF-8 support

---
 program/steps/mail/func.inc     | 8 +++-----
 program/steps/mail/sendmail.inc | 6 ------
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'program/steps/mail')

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)
   {
-- 
cgit v1.2.3