Changeset 6483 for trunk/expressoMail1_2

Timestamp:

06/13/12 18:15:17 (12 years ago)

Author:

cristiano

Message:

Ticket #2857 - Problema na inserção de fonte padrão do expresso

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/rich_text_editor.js (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3033 +3033 @@
              */
             ////////////////////////////////////////////////////////////////////////////////////////////////////
-
-            $this->rfc2397ToEmbeddedAttachment($mailService , $body); 
-
             if ($isHTML)
+            {
+                $this->rfc2397ToEmbeddedAttachment($mailService , $body);
+
+                require_once(dirname(__FILE__).'/../../library/CssToInlineStyles/css_to_inline_styles.php');
+                $defaultStyle = '.expressoDefaultFont{';
+
+                if(isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_family_editor']) && $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_family_editor'])
+                    $defaultStyle .= ' font-family:'.$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_family_editor'] .';';
+                
+                if(isset($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_size_editor']) && $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_size_editor'])
+                    $defaultStyle .= ' font-size:'.$_SESSION['phpgw_info']['user']['preferences']['expressoMail']['font_size_editor'].';';
+                
+                $defaultStyle .= '}';
+
+                $cssToInlineStyles = new CSSToInlineStyles('<span class="expressoDefaultFont">'.$body.'</span>');
+                $cssToInlineStyles->setUseInlineStylesBlock(true);
+                $cssToInlineStyles->setCSS($defaultStyle);
+                $cssToInlineStyles->setCleanup(TRUE);
+                $body = $cssToInlineStyles->convert(); //Converte as tag style em inline styles
+                unset($cssToInlineStyles);
+
                 $mailService->setBodyHtml($body);
+            }    
             else
                 $mailService->setBodyText($body);

trunk/expressoMail1_2/js/rich_text_editor.js

@@ -200 +200 @@
         
         $(".cke_editor").css("white-space", "normal");
-        RichTextEditor.editorReady = true;
-     }  
+
+    if(typeof(preferences.font_size_editor) !== 'undefined')
+        $(editor.document.$.body).css("font-size",preferences.font_size_editor);
+    if(typeof(preferences.font_family_editor) !== 'undefined')
+        $(editor.document.$.body).css("font-family",preferences.font_family_editor);
+
+    RichTextEditor.editorReady = true;
+    }   
 }