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

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Sigurd Nes <sigurdne>   07/02/20 15:20:06

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

Log message:
        UTF-fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11

Patches:
Index: class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- class.bocompose.inc.php     20 Feb 2007 10:27:37 -0000      1.7
+++ class.bocompose.inc.php     20 Feb 2007 15:20:06 -0000      1.8
@@ -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.7 2007/02/20 10:27:37 sigurdne Exp 
$ */
+       /* $Id: class.bocompose.inc.php,v 1.8 2007/02/20 15:20:06 sigurdne Exp 
$ */
 
        class bocompose
        {
@@ -269,7 +269,6 @@
                                        }
                                }
                                
-                               
                                // reply to any address which is to, but not to 
my self
                                $oldTo = 
$bofelamimail->decode_header(trim($headers->toaddress));
                                $addressParts = 
imap_rfc822_parse_adrlist($oldTo, '');
@@ -300,7 +299,6 @@
                                }
                        }
                        
-                       
                        // check for Re: in subject header
                        if(strtolower(substr(trim($headers->Subject), 0, 3)) == 
"re:")
                        {
@@ -325,7 +323,7 @@
 
                        for($i=0; $i<count($bodyParts); $i++)
                        {
-                               if(!empty($this->sessionData['body'])) 
$$this->sessionData['body'] .= "\n\n";
+                               if(!empty($this->sessionData['body'])) 
$this->sessionData['body'] .= "\n\n";
                                // add line breaks to $bodyParts
                                $newBody        = 
explode("\n",$bodyParts[$i]['body']);
                                
@@ -336,11 +334,10 @@
                                        $value .= "\n";
                                        $bodyAppend = 
wordwrap($value,70,"\n",1);
                                        $bodyAppend = str_replace("\n", "\n>", 
$bodyAppend);
-                                       $this->sessionData['body'] .= 
htmlentities($bodyAppend,ENT_COMPAT,'UTF-8');
+                                       $this->sessionData['body'] .= 
htmlentities($bodyAppend,ENT_COMPAT);
                                }
                        }
                                                                                
                                                
-                                       
                        $bofelamimail->closeConnection();
                        
                        $this->saveSessionData();

Index: class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.uicompose.inc.php     20 Feb 2007 10:27:37 -0000      1.10
+++ class.uicompose.inc.php     20 Feb 2007 15:20:06 -0000      1.11
@@ -11,7 +11,7 @@
        * Free Software Foundation; either version 2 of the License, or (at 
your    *
        * option) any later version.                                            
    *
        
\***************************************************************************/
-       /* $Id: class.uicompose.inc.php,v 1.10 2007/02/20 10:27:37 sigurdne Exp 
$ */
+       /* $Id: class.uicompose.inc.php,v 1.11 2007/02/20 15:20:06 sigurdne Exp 
$ */
 
        class uicompose
        {
@@ -177,11 +177,11 @@
                        
                        // header
                        
$this->t->set_var("from",htmlentities($this->bocompose->getUserName(),ENT_QUOTES));
-                       
$this->t->set_var("to",htmlentities((isset($sessionData['to'])?$sessionData['to']:''),ENT_QUOTES));
-                       
$this->t->set_var("cc",htmlentities((isset($sessionData['cc'])?$sessionData['cc']:''),ENT_QUOTES));
-                       
$this->t->set_var("bcc",htmlentities((isset($sessionData['bcc'])?$sessionData['bcc']:''),ENT_QUOTES));
-                       
$this->t->set_var("reply_to",htmlentities((isset($sessionData['reply_to'])?$sessionData['reply_to']:''),ENT_QUOTES));
-                       
$this->t->set_var("subject",htmlentities((isset($sessionData['subject'])?$sessionData['subject']:''),ENT_QUOTES));
+                       
$this->t->set_var("to",htmlentities((isset($sessionData['to'])?$sessionData['to']:''),ENT_QUOTES,'UTF-8'));
+                       
$this->t->set_var("cc",htmlentities((isset($sessionData['cc'])?$sessionData['cc']:''),ENT_QUOTES,'UTF-8'));
+                       
$this->t->set_var("bcc",htmlentities((isset($sessionData['bcc'])?$sessionData['bcc']:''),ENT_QUOTES,'UTF-8'));
+                       
$this->t->set_var("reply_to",htmlentities((isset($sessionData['reply_to'])?$sessionData['reply_to']:''),ENT_QUOTES,'UTF-8'));
+                       
$this->t->set_var("subject",htmlentities((isset($sessionData['subject'])?$sessionData['subject']:''),ENT_QUOTES,'UTF-8'));
                        $this->t->pparse("out","header");
 
                        // body