[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/24 21:42:10

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

Log message:
        enable richtext

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.bocompose.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/felamimail/inc/class.uicompose.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13

Patches:
Index: class.bocompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.bocompose.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.bocompose.inc.php     23 Feb 2007 23:06:45 -0000      1.14
+++ class.bocompose.inc.php     24 Feb 2007 21:42:10 -0000      1.15
@@ -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.14 2007/02/23 23:06:45 sigurdne Exp 
$ */
+       /* $Id: class.bocompose.inc.php,v 1.15 2007/02/24 21:42:10 sigurdne Exp 
$ */
 
        class bocompose
        {
@@ -484,7 +484,15 @@
                        
                        $mail->WordWrap = 76;
                        $mail->Subject = 
$bofelamimail->encodeHeader(utf8_decode($this->sessionData['subject']),'q');
+
+                       
if(!isset($GLOBALS['phpgw_info']['user']['preferences']['common']['rteditor']) 
|| $GLOBALS['phpgw_info']['user']['preferences']['common']['rteditor']=='none')
+                       {
                        $mail->IsHTML(false);
+                       }
+                       else
+                       {
+                               $mail->IsHTML(true);
+                       }
                        $mail->Body    = 
utf8_decode($this->sessionData['body']);
                        if (!empty($this->sessionData['signature']))
                        {

Index: class.uicompose.inc.php
===================================================================
RCS file: /sources/phpgroupware/felamimail/inc/class.uicompose.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.uicompose.inc.php     21 Feb 2007 11:56:44 -0000      1.12
+++ class.uicompose.inc.php     24 Feb 2007 21:42:10 -0000      1.13
@@ -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.12 2007/02/21 11:56:44 sigurdne Exp 
$ */
+       /* $Id: class.uicompose.inc.php,v 1.13 2007/02/24 21:42:10 sigurdne Exp 
$ */
 
        class uicompose
        {
@@ -51,7 +51,12 @@
                        $this->rowColor[0] = 'row_on';
                        $this->rowColor[1] = 'row_off';
 
-
+                       if ( !isset($GLOBALS['phpgw']->richtext) || 
!is_object($GLOBALS['phpgw']->richtext) )
+                       {
+                               $GLOBALS['phpgw']->richtext =& 
createObject('phpgwapi.richtext');
+                       }
+                       $GLOBALS['phpgw']->richtext->replace_element('body');
+                       $GLOBALS['phpgw']->richtext->generate_script();
                }
                
                function unhtmlentities ($string)