DataObjects/Core_mailing_list_message.php

diff --git a/DataObjects/Core_mailing_list_message.php b/DataObjects/Core_mailing_list_message.php
index 4a3440b..b4dfd73 100644 (file)
--- a/DataObjects/Core_mailing_list_message.php
+++ b/DataObjects/Core_mailing_list_message.php
@@ -200,31 +200,16 @@ class Pman_Core_DataObjects_Core_mailing_list_message extends DB_DataObject
     {    
         $contents = (array)$obj;
         
-        $this->cachedMailWithOutImages(true, false);
-        
-        $contents['subject'] = $this->subject;
-        
-        require_once 'Pman/Core/Mailer.php';
+        $person = !empty($contents['person']) ? $contents['person'] : $this->authUser;
         
-        $templateDir = session_save_path() . '/email-cache-' . getenv('APACHE_RUN_USER') ;
-        $r = new Pman_Core_Mailer(array(
-            'template'=> $q->id,
-            'templateDir' => $templateDir,
-            'page' => $q,
-            'contents' => $contents
-            //array(
-            //    'person' => $person,
-            //    'subject' => $this->message_id_subject,
-           // )
-        ));
+        $this->cachedMailWithOutImages(true, false);
         
+        $this->getMailerObject($person, false, false, true);
         
-         
-        ///print_r($r->toData());
         $ret = $r->toData();
-        $images = file_get_contents(session_save_path() . '/email-cache-' . getenv('APACHE_RUN_USER') . '/mail/' . $q->id . '-images.txt');
-       // var_dump($images);exit;
         
+        $images = file_get_contents(session_save_path() . '/email-cache-' . getenv('APACHE_RUN_USER') . '/mail/' . $this->tableName() . '-' . $this->id . '-images.txt');
+       
         $ret['body'] = str_replace('%Images%', $images, $ret['body']);
         
         return $r->send($ret);