Mailer.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 7f416ba..2a0260f 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -86,7 +86,7 @@ class Pman_Core_Mailer {
       
     var $bcc = false;
     
-    function Pman_Core_Mailer($args) {
+    function __construct($args) {
         foreach($args as $k=>$v) {
             // a bit trusting..
             $this->$k =  $v;
@@ -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) {
@@ -159,9 +157,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;
             }
@@ -169,7 +166,6 @@ class Pman_Core_Mailer {
             
             $htmltemplate->compile('mail/'. $templateFile.'.body.html');
             $htmlbody =  $htmltemplate->bufferedOutputObject($content);
-            print_r($htmlbody);exit;
             
             $this->htmlbody = $htmlbody;
             
@@ -189,13 +185,12 @@ class Pman_Core_Mailer {
         //print_R($tmp_opts);
         // $tmp_opts['force'] = true;
         $template = new HTML_Template_Flexy(  $tmp_opts );
-        
         $template->compile('mail/'. $templateFile.'.txt');
         
         /* use variables from this object to ouput data. */
         $mailtext = $template->bufferedOutputObject($content);
         //print_r($mailtext);exit;
-       print_r($mailtext);exit;
+       
         
         
         //echo "<PRE>";print_R($mailtext);
@@ -315,8 +310,8 @@ class Pman_Core_Mailer {
         
         $pg = $ff->page;
         
-        
         $email = is_array($email)  ? $email : $this->toData();
+        
         if (is_a($email, 'PEAR_Error')) {
             $pg->addEvent("COREMAILER-FAIL",  false, "email toData failed");