Changeset 6505 for branches/2.4/expressoMail1_2

Timestamp:

06/14/12 18:16:02 (12 years ago)

Author:

eduardow

Message:

Ticket #2857 - Problema de formatação de emails criados no expresso e abertos em outros clientes.

Location:

branches/2.4/expressoMail1_2

Files:

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

branches/2.4/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -3035 +3035 @@
 
             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);

branches/2.4/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; 
+  }    
 }