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

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    felamimail
Changes by:     Sigurd Nes <sigurdne>   07/02/23 08:51:51

Modified files:
        inc            : class.bocompose.inc.php 
        setup          : phpgw_en.lang 

Log message:
        Fix for forward

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

Patches:
Index: inc/class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- inc/class.bocompose.inc.php 21 Feb 2007 18:23:03 -0000      1.10
+++ inc/class.bocompose.inc.php 23 Feb 2007 08:51:51 -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.bocompose.inc.php,v 1.10 2007/02/21 18:23:03 sigurdne Exp 
$ */
+       /* $Id: class.bocompose.inc.php,v 1.11 2007/02/23 08:51:51 sigurdne Exp 
$ */
 
        class bocompose
        {
@@ -146,20 +146,21 @@
                        #       $attachments = 
$bofelamimail->get_attachments($sections);
                        #}
                        
-                       $this->sessionData['body']       = "                  
-----------Originalnachricht-----------\n\n";
-                       $this->sessionData['body']      .= "Betreff: 
".$bofelamimail->decode_header($headers->Subject)."\n";
-                       $this->sessionData['body']      .= "Von: 
".$bofelamimail->decode_header($headers->toaddress)."\n";
-                       $this->sessionData['body']      .= "An: 
".$bofelamimail->decode_header($headers->fromaddress)."\n\n";
+                       $this->sessionData['body']       = "                  
-----------".lang('Forwarded Message')."-----------\n\n";
+                       $this->sessionData['body']      .= lang('subject').": 
".$bofelamimail->decode_header($headers->Subject)."\n";
+                       $this->sessionData['body']      .= lang('to').": 
".$bofelamimail->decode_header($headers->toaddress)."\n";
+                       $this->sessionData['body']      .= lang('from').": 
".$bofelamimail->decode_header($headers->fromaddress)."\n\n";
                        
                        // iterate through message parts
                        // get the body
                        $bodyParts = $bofelamimail->getMessageBody($_uid, 
'only_if_no_text');
                        for($i=0; $i<count($bodyParts); $i++)
                        {
-                               $this->sessionData['body']      .= 
$bodyParts[$i]['body'];
+               //              $this->sessionData['body']      .= 
$bodyParts[$i]['body'];
+                               $this->sessionData['body'] .= htmlentities( 
$bodyParts[$i]['body'],ENT_COMPAT);
                        }
                        
-                       $this->sessionData['body']       .= "\n\n               
   -----------Originalnachricht-----------\n\n";
+                       $this->sessionData['body']       .= "\n\n               
   -----------".lang('Forwarded Message')."-----------\n\n";
                                        
                        $attachments = 
$bofelamimail->getMessageAttachments($_uid);
                        if(is_array($attachments))

Index: setup/phpgw_en.lang
===================================================================
RCS file: /sources/phpgroupware/felamimail/setup/phpgw_en.lang,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- setup/phpgw_en.lang 18 Dec 2006 20:03:32 -0000      1.8
+++ setup/phpgw_en.lang 23 Feb 2007 08:51:51 -0000      1.9
@@ -103,6 +103,7 @@
 for mail to be send - not functional yet       felamimail      en      For 
mail to be send - not functional yet
 for received mail      felamimail      en      For received mail
 forward        felamimail      en      Forward
+Forwarded Message      felamimail      en      Forwarded Message
 found  felamimail      en      Found
 from   felamimail      en      From
 full name      felamimail      en      Full Name