[Phpgroupware-cvs] felamimail/inc class.bofelamimail.inc.php class...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Sigurd Nes <sigurdne>   07/02/21 12:24:21

Modified files:
        inc            : class.bofelamimail.inc.php 
                         class.phpmailer.inc.php 

Log message:
        UTF-fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.phpmailer.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4

Patches:
Index: class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- class.bofelamimail.inc.php  20 Feb 2007 10:27:37 -0000      1.16
+++ class.bofelamimail.inc.php  21 Feb 2007 12:24:21 -0000      1.17
@@ -11,7 +11,7 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.bofelamimail.inc.php,v 1.16 2007/02/20 10:27:37 sigurdne 
Exp $ */
+       /* $Id: class.bofelamimail.inc.php,v 1.17 2007/02/21 12:24:21 sigurdne 
Exp $ */
 
        class bofelamimail
        {
@@ -295,7 +295,7 @@
                {
                        if($this->mbAvailable)
                        {
-                               return mb_convert_encoding( $_folderName, 
"UTF7-IMAP", "ISO_8859-1" );
+                               return mb_convert_encoding( $_folderName, 
"UTF7-IMAP", "UTF-8" );
                        }
                        
                        // if not
@@ -323,7 +323,7 @@
                                                // imap_8bit does not convert 
"?"
                                                // it does not need, but it 
should
                                                $value = 
str_replace("?","=3F",$value);
-                                               $retString .= 
"=?ISO-8859-1?Q?".$value."?=";
+                                               $retString .= 
"=?UTF-8?Q?".$value."?=";
                                        }
                                        #exit;
                                        return $retString;

Index: class.phpmailer.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.phpmailer.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.phpmailer.inc.php     18 Dec 2006 20:03:32 -0000      1.3
+++ class.phpmailer.inc.php     21 Feb 2007 12:24:21 -0000      1.4
@@ -35,7 +35,7 @@
      * @access public
      * @var string
      */
-    var $CharSet           = "iso-8859-1";
+    var $CharSet           = "utf-8";
 
     /**
      * Sets the Content-type of the message.