Changed Pman.Dialog.CoreEmail.bjsPman.Dialog.CoreEmail.js

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index 2b3c274..3868884 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -241,7 +241,9 @@ class Pman_Core_Mailer {
                 unset($parts[1]['Content-Type']);
             }
             $mime->setTXTBody($parts[2]);
+            $this->textbody = $parts[2];
             $mime->setHTMLBody($htmlbody);
+            
 //            var_dump($mime);exit;
             foreach($this->images as $cid=>$cdata) { 
             
@@ -269,8 +271,10 @@ class Pman_Core_Mailer {
                 if(preg_match('/text\/html/', $header['Content-Type'])){
                     $mime->setHTMLBody($parts[2]);
                     $mime->setTXTBody('This message is in HTML only');
+                    $this->textbody = 'This message is in HTML only';
                 }else{
                     $mime->setTXTBody($parts[2]);
+                    $this->textbody = $parts[2];
                     $mime->setHTMLBody('<PRE>'.htmlspecialchars($parts[2]).'</PRE>');
                 }
             }
@@ -365,6 +369,12 @@ class Pman_Core_Mailer {
         }
         
         $oe = error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
+        if ($this->debug) {
+            print_r(array(
+                'rcpts' => $rcpts,
+                'email' => $email
+            ));
+        }
         $ret = $mail->send($rcpts,$email['headers'],$email['body']);
         error_reporting($oe);
         if ($ret === true) {