From 541a6c2ee8ba1e5771fec8183cbd7635b7ffdbea Mon Sep 17 00:00:00 2001
From: edward <edward@roojs.com>
Date: Mon, 26 Mar 2018 16:52:33 +0800
Subject: [PATCH] Mailer.php

---
 Mailer.php | 64 +++++++++++++++++++++---------------------------------
 1 file changed, 25 insertions(+), 39 deletions(-)

diff --git a/Mailer.php b/Mailer.php
index 77d5d4c7..3c4575b3 100644
--- a/Mailer.php
+++ b/Mailer.php
@@ -454,53 +454,39 @@ 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('body');
+        
+        if(!$head->length){
+            $head = $dom->createElement('head');
+            $html->item(0)->insertBefore($head, $body->item(0));
+            $head = $dom->getElementsByTagName('head');
+        }
+        
+        $s = $dom->createElement('style');
+        $e = $dom->createTextNode($this->css_inline);
+        $s->appendChild($e);
+        $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 = $htmldoc->getHTML();
-        
-//        libxml_use_internal_errors (false);
-//        
-//        if (!function_exists('tidy_repair_string')) {
-//            return "INSTALL TIDY ON SERVER " . $html;
-//        }
-//        
-//        $html = tidy_repair_string(
-//                $html,
-//                array(
-//                  'indent' => TRUE,
-//                    'output-xhtml' => TRUE,
-//                    'wrap' => 120
-//                ),
-//                'UTF8'
-//        );
+        $html = $doc->getHTML();
         
         return $html;
-        
-//        $dom = new DOMDocument();
-//        
-//        @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
-//        
-//        $html = $dom->getElementsByTagName('html');
-//        $head = $dom->getElementsByTagName('head');
-//        $body = $dom->getElementsByTagName('body');
-//        
-//        if(!$head->length){
-//            $head = $dom->createElement('head');
-//            $html->item(0)->insertBefore($head, $body->item(0));
-//            $head = $dom->getElementsByTagName('head');
-//        }
-//        
-//        $s = $dom->createElement('style');
-//        $e = $dom->createTextNode($this->css_inline);
-//        $s->appendChild($e);
-//        $head->item(0)->appendChild($s);
-//        
-//        return $dom->saveHTML();
+        */
     }
     
     function fetchImage($url)
-- 
2.39.2