[Phpgroupware-cvs] felamimail/inc class.bocompose.inc.php class.bo...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Sigurd Nes <sigurdne>   07/02/21 18:23:03

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

Log message:
        UTF-fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bofelamimail.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18

Patches:
Index: class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- class.bocompose.inc.php     21 Feb 2007 15:17:24 -0000      1.9
+++ class.bocompose.inc.php     21 Feb 2007 18:23:03 -0000      1.10
@@ -11,7 +11,7 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.bocompose.inc.php,v 1.9 2007/02/21 15:17:24 sigurdne Exp 
$ */
+       /* $Id: class.bocompose.inc.php,v 1.10 2007/02/21 18:23:03 sigurdne Exp 
$ */
 
        class bocompose
        {
@@ -426,7 +426,7 @@
                        $mail->PluginDir = PHPGW_SERVER_ROOT."/felamimail/inc/";
                        $mail->AddCustomHeader("X-Mailer: FeLaMiMail version 
0.9.4");
                        if(isset($this->preferences['organizationName']))
-                               $mail->AddCustomHeader("Organization: 
".$this->preferences['organizationName']);
+                               $mail->AddCustomHeader("Organization: 
".utf8_decode($this->preferences['organizationName']));
 
                        if (!empty($this->sessionData['to']))
                        {
@@ -482,13 +482,13 @@
                        }
                        
                        $mail->WordWrap = 76;
-                       $mail->Subject = 
$bofelamimail->encodeHeader($this->sessionData['subject'],'q');
+                       $mail->Subject = 
$bofelamimail->encodeHeader(utf8_decode($this->sessionData['subject']),'q');
                        $mail->IsHTML(false);
-                       $mail->Body    = $this->sessionData['body'];
+                       $mail->Body    = 
utf8_decode($this->sessionData['body']);
                        if (!empty($this->sessionData['signature']))
                        {
                                $mail->Body     .= "\r\n--\r\n";
-                               $mail->Body     .= 
$this->sessionData['signature'];
+                               $mail->Body     .= 
utf8_decode($this->sessionData['signature']);
                        }
                        if (isset($this->sessionData['attachments']) && 
is_array($this->sessionData['attachments']))
                        {
@@ -497,7 +497,7 @@
                                        $mail->AddAttachment
                                        (
                                                $value['file'],
-                                               $value['name'],
+                                               utf8_decode($value['name']),
                                                'base64',
                                                $value['type']
                                        );
@@ -534,7 +534,7 @@
                        if(isset($this->sessionData['uid']))
                        {
                                // mark message as answered
-                               $bofelamimail = 
CreateObject('felamimail.bofelamimail',$this->sessionData['folder']);
+                               $bofelamimail = 
CreateObject('felamimail.bofelamimail',isset($this->sessionData['folder'])?$this->sessionData['folder']:'');
                                $bofelamimail->openConnection();
                                
$bofelamimail->flagMessages("answered",array('0' => $this->sessionData['uid']));
                                $bofelamimail->closeConnection();

Index: class.bofelamimail.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bofelamimail.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.bofelamimail.inc.php  21 Feb 2007 12:24:21 -0000      1.17
+++ class.bofelamimail.inc.php  21 Feb 2007 18:23:03 -0000      1.18
@@ -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.17 2007/02/21 12:24:21 sigurdne 
Exp $ */
+       /* $Id: class.bofelamimail.inc.php,v 1.18 2007/02/21 18:23:03 sigurdne 
Exp $ */
 
        class bofelamimail
        {
@@ -323,7 +323,7 @@
                                                // imap_8bit does not convert 
"?"
                                                // it does not need, but it 
should
                                                $value = 
str_replace("?","=3F",$value);
-                                               $retString .= 
"=?UTF-8?Q?".$value."?=";
+                                               $retString .= 
"=?ISO_8859-1?Q?".$value."?=";
                                        }
                                        #exit;
                                        return $retString;
@@ -335,6 +335,7 @@
                function flagMessages($_flag, $_messageUID)
                {
                        reset($_messageUID);
+                       $msglist = '';
                        while(list($key, $value) = each($_messageUID))
                        {
                                if(!empty($msglist)) $msglist .= ",";