DataObjects/Core_watch.php

[Pman.Core] / Mailer.php

diff --git a/Mailer.php b/Mailer.php
index e138836..4fdebf5 100644 (file)
--- a/Mailer.php
+++ b/Mailer.php
@@ -213,12 +213,12 @@ class Pman_Core_Mailer {
         
         if(!empty($this->attachments)){
             //if got a attachments
+            $header = $mime->headers($parts[1]);
             
             if (isset($parts[1]['Content-Type'])) {
                 unset($parts[1]['Content-Type']);
             }
             
-            $header = $mime->headers($parts[1]);
             if (!$isMime) {
             
                 if(preg_match('/text\/html/', $header['Content-Type'])){
@@ -233,8 +233,8 @@ class Pman_Core_Mailer {
                 $mime->addAttachment(
                         $attch['file'],
                         $attch['mimetype'],
-                        $attch['name'],
-                        false
+                        (!empty($attch['name'])) ? $attch['name'] : '',
+                        true
                 );
             }
             
@@ -259,8 +259,14 @@ class Pman_Core_Mailer {
     function send()
     {
         
+        $pg = HTML_FlexyFramework::get()->page;
+        
+        
         $email = $this->toData();
         if (is_a($email, 'PEAR_Error')) {
+            $pg->addEvent("COREMAILER-FAIL",  false, "email toData failed"); 
+      
+            
             return $email;
         }
         if ($this->debug) {
@@ -270,8 +276,11 @@ class Pman_Core_Mailer {
         $mailOptions = PEAR::getStaticProperty('Mail','options');
         //print_R($mailOptions);exit;
         $mail = Mail::factory("SMTP",$mailOptions);
-        $headers['Date'] = date('r'); 
+        $email['headers']['Date'] = date('r'); 
         if (PEAR::isError($mail)) {
+             $pg->addEvent("COREMAILER-FAIL",  false, "mail factory failed"); 
+      
+            
             return $mail;
         } 
         $rcpts = $this->rcpts == false ? $email['recipents'] : $this->rcpts;
@@ -283,6 +292,12 @@ class Pman_Core_Mailer {
         $oe = error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT);
         $ret = $mail->send($rcpts,$email['headers'],$email['body']);
         error_reporting($oe);
+        if ($ret === true) { 
+            $pg->addEvent("COREMAILER-SENT",  false,
+                'To: ' .  ( is_array($rcpts) ? implode(', ', $rcpts) : $rcpts ) .
+                'Subject: '  . @$email['headers']['Subject']
+            ); 
+        }  
        
         return $ret;
     }