Mailer.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 4df3342..d8ac81e 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -124,12 +124,8 @@ class Pman_Core_Mailer {
             $http_host  = $ff->Pman['HTTP_HOST'];
         }
         
-        
         $content->HTTP_HOST = $http_host;
         
-        
-        
-        
         // this should be done by having multiple template sources...!!!
         
         require_once 'HTML/Template/Flexy.php';
@@ -172,6 +168,9 @@ class Pman_Core_Mailer {
             
             // for the html body, we may want to convert the attachments to images.
 //            var_dump($htmlbody);exit;
+            
+            
+            
             if ($this->replaceImages) {
                 $htmlbody = $this->htmlbodytoCID($htmlbody);    
             }
@@ -454,20 +453,18 @@ class Pman_Core_Mailer {
     }
     
     function htmlbodyInlineCss($html)
-    {
+    {   
         $dom = new DOMDocument();
         
         @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         
         $html = $dom->getElementsByTagName('html');
-        
         $head = $dom->getElementsByTagName('head');
-        
-        $body = $dom->getElementsByTagName('head');
+        $body = $dom->getElementsByTagName('body');
         
         if(!$head->length){
             $head = $dom->createElement('head');
-            $html->item(0)->insertBefore($head);
+            $html->item(0)->insertBefore($head, $body->item(0));
             $head = $dom->getElementsByTagName('head');
         }
         
@@ -477,6 +474,18 @@ class Pman_Core_Mailer {
         $head->item(0)->appendChild($s);
         
         return $dom->saveHTML();
+        
+        /* Inline
+        require_once 'HTML/CSS/InlineStyle.php';
+        
+        $doc = new HTML_CSS_InlineStyle($html);
+        
+        $doc->applyStylesheet($this->css_inline);
+        
+        $html = $doc->getHTML();
+        
+        return $html;
+        */
     }
     
     function fetchImage($url)