DataObjects/Core_notify_recur.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index afc09bf..fed4eae 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -106,6 +106,11 @@ class Pman_Core_NotifySend extends Pman
         }
         if (!empty($opts['debug'])) {
             print_r($w);
+            $ff = HTML_FlexyFramework::get();
+            if (!isset($ff->Core_Mailer)) {
+                $ff->Core_Mailer = array();
+            }
+            HTML_FlexyFramework::get()->Core_Mailer['debug'] = true;
         }
         
         $sent = (empty($w->sent) || preg_match('/^0000/', $w->sent)) ? false : true;
@@ -156,11 +161,19 @@ class Pman_Core_NotifySend extends Pman
         
         // let's work out the last notification sent to this user..
         $l = DB_DataObject::factory($this->table);
-        $l->setFrom( array(
+        
+        $lar = array(
                 'ontable' => $w->ontable,
                 'onid' => $w->onid,
-                'person_id' => $w->person_id,
-        ));        
+        );
+        // only newer version of the database us this..
+        $personid_col = strtolower($w->person_table).'_id';
+        if (isset($w->{$personid_col})) {
+            $lar[$personid_col] = $w->{$personid_col};
+        }
+        
+        
+        $l->setFrom( $lar );       
         $l->whereAdd('id != '. $w->id);
         $l->orderBy('sent DESC');
         $l->limit(1);
@@ -220,7 +233,7 @@ class Pman_Core_NotifySend extends Pman
             $old = clone($w);
             $w->act_when = $email['later'];
             $w->update($old);
-            $this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator");
+            $this->errorHandler(date('Y-m-d h:i:s ') . " Delivery postponed by email creator to {$email['later']}");
         }
         
          
@@ -243,7 +256,6 @@ class Pman_Core_NotifySend extends Pman
         // since some of them have spaces?!?!
         $p->email = trim($p->email);
         
-        
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
             $ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
@@ -291,7 +303,7 @@ class Pman_Core_NotifySend extends Pman
                 $this->addEvent('NOTIFY', $w, 'MX LOOKUP FAILED ' . $dom );
                 $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
                 $w->update($ww);
-                $this->errorHandler(date('Y-m-d h:i:s') . " - GREYLISTED\n");
+                $this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED\n");
             }
             
             $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
@@ -346,6 +358,15 @@ class Pman_Core_NotifySend extends Pman
                     'debug' => 1,
                     'debug_handler' => array($this, 'debugHandler')
                 ));
+            
+            // if the host is the mail host + it's authenticated add auth details
+            // this normally will happen if you sent  Pman_Core_NotifySend['host']
+            if (isset($ff->Mail['host']) && $ff->Mail['host'] == $dom && !empty($ff->Mail['auth'] )) {
+                $mailer->auth = true;
+                $mailer->username = $ff->Mail['username'] ;
+                $mailer->password = $ff->Mail['password'] ;        
+            }
+            
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
              
             
@@ -363,23 +384,23 @@ class Pman_Core_NotifySend extends Pman
                 
                 // enable cc in notify..
                 if (!empty($email['headers']['Cc'])) {
-                    $mailer = Mail::factory('smtp', array(
+                    $cmailer = Mail::factory('smtp', array(
                        //'host'    => $dom ,
                       //  'debug' => true
                     ));
                     $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
-                    $mailer->send($email['headers']['Cc'],
+                    $cmailer->send($email['headers']['Cc'],
                                   $email['headers'], $email['body']);
                     
                 }
                 
                 if (!empty($email['bcc'])) {
-                    $mailer = Mail::factory('smtp', array(
+                    $cmailer = Mail::factory('smtp', array(
                        //'host'    => $dom ,
                       //  'debug' => true
                     ));
                     $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
-                    $mailer->send($email['bcc'],
+                    $cmailer->send($email['bcc'],
                                   $email['headers'], $email['body']);
                     
                 }
@@ -402,15 +423,18 @@ class Pman_Core_NotifySend extends Pman
             if (in_array($code, array( 421, 450, 451, 452))   && $next_try_min < (2*24*60)) {
                 // try again later..
                 // check last event for this item..
-                $errmsg=  $fail ? ($res->userinfo['smtpcode'] . ': ' .$res->toString()) :  " - UNKNOWN ERROR";
-                if (isset($res->userinfo['smtptext'])) {
+                //$errmsg=  $fail ? ($res->userinfo['smtpcode'] . ': ' .$res->toString()) :  " - UNKNOWN ERROR";
+                $errmsg=  $res->userinfo['smtpcode'] . ': ' .$res->message ;
+                if (!empty($res->userinfo['smtptext'])) {
                     $errmsg=  $res->userinfo['smtpcode'] . ':' . $res->userinfo['smtptext'];
                 }
                 //print_r($res);
                 $this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
                 $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
                 $w->update($ww);
-                $this->errorHandler(date('Y-m-d h:i:s') . " - GREYLISTED\n");
+                
+                
+                $this->errorHandler(date('Y-m-d h:i:s') . " - GREYLISTED -  $errmsg \n");
             }
             $fail = true;
             break;
@@ -537,10 +561,12 @@ class Pman_Core_NotifySend extends Pman
     
     function errorHandler($msg)
     {
-        if(empty($this->referer)){
-            die($msg);
+        if($this->error_handler == 'exception'){
+            throw new Exception($msg);
         }
         
-        throw new Exception($msg);
+        die($msg);
+        
+        
     }
 }
\ No newline at end of file