DataObjects/Core_email.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index d76bb30..31b37a5 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -108,10 +108,8 @@ class Pman_Core_Mailer {
     
     function toData()
     {
-    
         $templateFile = $this->template;
         $args = (array)$this->contents;
-        
         $content  = clone($this->page);
         
         foreach($args as $k=>$v) {
@@ -139,6 +137,7 @@ class Pman_Core_Mailer {
         $tmp_opts = array(
            // 'forceCompile' => true,
             'site_prefix' => false,
+            'multiSource' => true,
         );
         if (!empty($this->templateDir)) {
             $tmp_opts['templateDir'] = $this->templateDir;
@@ -159,9 +158,8 @@ class Pman_Core_Mailer {
         $htmlbody = false;
         $html_tmp_opts = $tmp_opts;
         $htmltemplate = new HTML_Template_Flexy( $html_tmp_opts );
-        if (is_string($htmltemplate->resolvePath('mail/'.$templateFile.'.body.html')) ) {
+        if (is_string($htmltemplate->resolvePath('mail/'.$templateFile.'.body.html')) ) { 
             // then we have a multi-part email...
-            
             if (!empty($this->html_locale)) {
                 $html_tmp_opts['locale'] = $this->html_locale;
             }
@@ -187,8 +185,8 @@ class Pman_Core_Mailer {
         
         //print_R($tmp_opts);
         // $tmp_opts['force'] = true;
-        $template = new HTML_Template_Flexy(  $tmp_opts );
         
+        $template = new HTML_Template_Flexy(  $tmp_opts );
         $template->compile('mail/'. $templateFile.'.txt');
         
         /* use variables from this object to ouput data. */
@@ -310,12 +308,13 @@ class Pman_Core_Mailer {
     }
     function send($email = false)
     {
+                       
         $ff = HTML_FlexyFramework::get();
         
         $pg = $ff->page;
         
-        print_r('die');exit;
         $email = is_array($email)  ? $email : $this->toData();
+        
         if (is_a($email, 'PEAR_Error')) {
             $pg->addEvent("COREMAILER-FAIL",  false, "email toData failed");