DataObjects/Core_notify_recur.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index f4f7340..8601f71 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;
             
@@ -360,17 +365,33 @@ class Pman_Core_Mailer {
         // this may raise parse errors as some html may be a component..
         @$dom->loadHTML('<?xml encoding="UTF-8">' .$html);
         $links = $dom->getElementsByTagName('link');
-        //<link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/css-mailer/mailer.css"> 
-        foreach ($links as $i=>$link) {
+        $lc = array();
+        foreach ($links as $link) {  // duplicate as links is dynamic and we change it..!
+            $lc[] = $link;
+        }
+        //<link rel="stylesheet" type="text/css" href="{rootURL}/roojs1/css-mailer/mailer.css">
+        
+        foreach ($lc as $i=>$link) {
+            //var_dump($link->getAttribute('href'));
+            
             if ($link->getAttribute('rel') != 'stylesheet') {
                 continue;
             }
             $url  = $link->getAttribute('href');
             $file = $ff->rootDir . $url;
-            if (!file_exists($file)) {
-                echo "SKIP" . $file ."<br/>";
-                continue;
+            
+            if (!preg_match('#^http://#', $url)) {
+                $file = $ff->rootDir . $url;
+
+                if (!file_exists($file)) {
+                    echo $file;
+                    $link->setAttribute('href', 'missing:' . $file);
+                    continue;
+                }
+            } else {
+               $file = $url;  
             }
+            
             $par = $link->parentNode;
             $par->removeChild($link);
             $s = $dom->createElement('style');
@@ -388,7 +409,9 @@ class Pman_Core_Mailer {
     
     function fetchImage($url)
     {
-        
+        if($this->debug) {
+            echo "FETCH : $url\n";
+        }
         if ($url[0] == '/') {
             $ff = HTML_FlexyFramework::get();
             $file = $ff->rootDir . $url;