DataObjects/Core_person_signup.php

[Pman.Core] / DataObjects / Core_email.php

diff --git a/DataObjects/Core_email.php b/DataObjects/Core_email.php
index 278c45f..1f9318d 100644 (file)
--- a/DataObjects/Core_email.php
+++ b/DataObjects/Core_email.php
@@ -188,12 +188,17 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
         
         foreach ($xpath->query('//img[@src]') as $img) { // process images!
             $href = $img->getAttribute('src');
-            $cid = explode('-', array_pop(explode('#', $href)));
+            $hash = explode('#', $href);
             // we name all our cid's as attachment-*
+            // however the src url may be #image-*
             
             
-            if(isset($cid[1])){
-                $img->setAttribute('src', 'cid:' . $cid[1]);
+            if(!isset($hash[1])){
+                continue;
+            }
+            $cid = explode('-', $hash[1]);
+            if(!empty($cid[1])){
+                $img->setAttribute('src', 'cid:attachment-' . $cid[1]);
             }
         }
         
@@ -285,6 +290,7 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
      * $x->send(array(
      *      'rcpts' => "Tester <sales@roojs.com>",
      *      'page' => $this
+     *      'mailer_opts' => array( <<< additional options, like urlmap..)
      *       'link' => 'http://......'
        );
      * // on the template use {link:h} to render the link
@@ -329,11 +335,16 @@ class Pman_Core_DataObjects_Core_email extends DB_DataObject
             'template'=> $this->tableName() . '-' . $this->id,
             'templateDir' => $templateDir,
             'page' => $this,
-            'contents' => $contents
+            'contents' => $contents,
+            'css_embed' => true, // we should always try and do this with emails...
         );
         if (isset($contents['rcpts'])) {
             $cfg['rcpts'] = $contents['rcpts'];
         }
+        if (isset($contents['mailer_opts']) && is_array($contents['mailer_opts'])) {
+            $cfg = array_merge($contents['mailer_opts'], $cfg);
+        }
+        
         
         $r = new Pman_Core_Mailer($cfg);