DataObjects/Core_notify.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 719675f..aea8fd6 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -340,6 +340,11 @@ class Pman_Core_Mailer {
             if (preg_match('#^cid:#', $url)) {
                 continue;
             }
+            $me = $img->getAttribute('mailembed');
+            if ($me == 'no') {
+                continue;
+            }
+            
             $conv = $this->fetchImage($url);
             $this->images[$conv['contentid']] = $conv;
             
@@ -354,7 +359,9 @@ class Pman_Core_Mailer {
     }
     function htmlbodyCssEmbed($html)
     {
+        $ff = HTML_FlexyFramework::get();
         $dom = new DOMDocument();
+        
         // this may raise parse errors as some html may be a component..
         @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         $links = $dom->getElementsByTagName('link');
@@ -366,14 +373,15 @@ class Pman_Core_Mailer {
             $url  = $link->getAttribute('href');
             $file = $ff->rootDir . $url;
             if (!file_exists($file)) {
+                //echo "SKIP" . $file ."<br/>";
                 continue;
             }
-            $par = $img->parentNode();
+            $par = $link->parentNode;
             $par->removeChild($link);
             $s = $dom->createElement('style');
             $e = $dom->createTextNode(file_get_contents($file));
             $s->appendChild($e);
-            $par->appendChild($e);
+            $par->appendChild($s);
             
         }
         return $dom->saveHTML();