Mailer.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 8d0be13..3c4575b 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -380,7 +380,7 @@ class Pman_Core_Mailer {
     {
         $dom = new DOMDocument();
         // this may raise parse errors as some html may be a component..
-        @$dom->loadHTML($html);
+        @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         $imgs= $dom->getElementsByTagName('img');
         
         foreach ($imgs as $i=>$img) {
@@ -411,7 +411,7 @@ class Pman_Core_Mailer {
         $dom = new DOMDocument();
         
         // this may raise parse errors as some html may be a component..
-        @$dom->loadHTML($html);
+        @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         $links = $dom->getElementsByTagName('link');
         $lc = array();
         foreach ($links as $link) {  // duplicate as links is dynamic and we change it..!
@@ -454,16 +454,14 @@ class Pman_Core_Mailer {
     }
     
     function htmlbodyInlineCss($html)
-    {
-        print_R($html);exit;
-        
+    {   
         $dom = new DOMDocument();
         
-        @$dom->loadHTML($html);
+        @$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');
@@ -477,6 +475,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)