X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=NotifySend.php;h=91afa5a1b7c52f06a0e3f6f3f8841f1314150fed;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hp=69e0c3450a9d521e9c1ed7f768cf95dbae06fedc;hpb=ad14ad7033e1961a069a0da842165fc54ee9221f;p=Pman.Core

diff --git a/NotifySend.php b/NotifySend.php
index 69e0c345..91afa5a1 100644
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -18,9 +18,16 @@ require_once 'Pman.php';
  *      recipients =>
  *      body =>
  *  )
- * 
- * 
+ *
+ *
+ * Note uses configuration
+ *
+ * Pman_Core_NotifySend[host] = 'localhost' << to override direct sending..
+ * Mail[helo] << helo host name
+ * Mail[socket_options] << any socket option.
  */
+class Pman_Core_NotifySend_Exception_Success extends Exception {}
+class Pman_Core_NotifySend_Exception_Fail extends Exception {}
 
 
 class Pman_Core_NotifySend extends Pman
@@ -63,51 +70,61 @@ class Pman_Core_NotifySend extends Pman
         
     );
     var $table = 'core_notify';
+    var $error_handler = 'die';
+    
     function getAuth()
     {
         $ff = HTML_FlexyFramework::get();
         if (!$ff->cli) {
-            die("access denied");
+            $this->errorHandler("access denied");
         }
         //HTML_FlexyFramework::ensureSingle(__FILE__, $this);
         return true;
         
     }
    
-    function get($id,$opts)
+    function get($id,$opts=array())
     {
-        if ($opts['DB_DataObject-debug']) {
+        
+        //print_r($opts);
+        if (!empty($opts['DB_DataObject-debug'])) {
             DB_DataObject::debugLevel($opts['DB_DataObject-debug']);
         }
+        
         //DB_DataObject::debugLevel(1);
         //date_default_timezone_set('UTC');
         // phpinfo();exit;
         $force = empty($opts['force']) ? 0 : 1;
         
         $w = DB_DataObject::factory($this->table);
-        
+
         if (!$w->get($id)) {
-            die("invalid id\n");
+            $this->errorHandler("invalid id\n");
         }
         if (!$force && strtotime($w->act_when) < strtotime($w->sent)) {
             
             
-            die("send repeat to early\n");
+            $this->errorHandler("send repeat to early\n");
         }
         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;
         
-//        if (!$force && (!empty($w->msgid) || $sent)) {
-//            $ww = clone($w);
-//            if (!$sent) { 
-//                $w->sent = $w->sqlValue("NOW()");
-//                $w->update($ww);
-//            }    
-//            die("message has been sent already.\n");
-//        }
+        if (!$force && (!empty($w->msgid) || $sent)) {
+            $ww = clone($w);
+            if (!$sent) { 
+                $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
+                $w->update($ww);
+            }    
+            $this->errorHandler("message has been sent already.\n");
+        }
         
         $o = $w->object();
         
@@ -116,11 +133,11 @@ class Pman_Core_NotifySend extends Pman
             $ev = $this->addEvent('NOTIFY', $w,
                             "Notification event cleared (underlying object does not exist)" );;
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s ') . 
+            $this->errorHandler(date('Y-m-d h:i:s ') . 
                      "Notification event cleared (underlying object does not exist)" 
                     ."\n");
         }
@@ -133,24 +150,32 @@ class Pman_Core_NotifySend extends Pman
             $ev = $this->addEvent('NOTIFY', $w,
                             "Notification event cleared (not user not active any more)" );;
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = $w->sent == '0000-00-00 00:00:00' ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s ') . 
+            $this->errorHandler(date('Y-m-d h:i:s ') . 
                      "Notification event cleared (not user not active any more)" 
                     ."\n");
-            die("message has been sent already.\n");
+            $this->errorHandler("message has been sent already.\n");
         }
         
         
         // 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);
@@ -179,41 +204,48 @@ class Pman_Core_NotifySend extends Pman
             $ev = $this->addEvent('NOTIFY', $w,
                             "Notification event cleared (not required any more)" );;
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s ') . 
+            $this->errorHandler(date('Y-m-d h:i:s ') . 
                      "Notification event cleared (not required any more)" 
                     ."\n");
         }
-     
-       
+        if (is_a($email, 'PEAR_Error')) {
+            $email =array(
+                'error' => $email->toString()
+            );
+        }
         
-        if ($email === false || isset($email['error'])) {
+        if (empty($p) && !empty($email['recipients'])) {
+            // make a fake person..
+            $p = (object) array(
+                'email' => $email['recipients']
+            );
+        }
+         
+        if ($email === false || isset($email['error']) || empty($p)) {
             // object returned 'false' - it does not know how to send it..
             $ev = $this->addEvent('NOTIFY', $w, isset($email['error'])  ?
                             $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable); 
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s ') . 
+            $this->errorHandler(date('Y-m-d h:i:s ') . 
                     (isset($email['error'])  ?
                             $email['error'] : "INTERNAL ERROR  - We can not handle " . $w->ontable)
                     ."\n");
         }
         
         
-        
-        
-        
         if (isset($email['later'])) {
             $old = clone($w);
             $w->act_when = $email['later'];
             $w->update($old);
-            die(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']}");
         }
         
          
@@ -222,6 +254,10 @@ class Pman_Core_NotifySend extends Pman
             $email['headers']['Message-Id'] = "<{$this->table}-{$id}@{$HOST}>";
             
         }
+        
+        
+            
+        
         //$p->email = 'alan@akbkhome.com'; //for testing..
         //print_r($email);exit;
         // should we fetch the watch that caused it.. - which should contain the method to call..
@@ -233,27 +269,28 @@ class Pman_Core_NotifySend extends Pman
          if (!empty($opts['send-to'])) {
             $p->email = $opts['send-to'];
         }
-        // since some of them have spaces?!?!
-        $p->email = trim($p->email);
         
+            // 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);
             $ww = clone($w);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s ') . "INVALID ADDRESS: " . $p->email. "\n");
+            $this->errorHandler(date('Y-m-d h:i:s ') . "INVALID ADDRESS: " . $p->email. "\n");
             
         }
         
         
         $ff = HTML_FlexyFramework::get();
         
-        
-        $dom = array_pop(explode('@', $p->email));
+        $explode_email = explode('@', $p->email);
+        $dom = array_pop($explode_email);
         
         $mxs = $this->mxs($dom);
         $ww = clone($w);
@@ -281,18 +318,18 @@ class Pman_Core_NotifySend extends Pman
         if ($mxs === false) {
             // only retry for 2 day son the MX issue..
             if ($retry < 120) {
-                $this->addEvent('NOTIFY', $w, 'MX LOOKUP FAILED ' . $dom . ' ' . $res->toString());
+                $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);
-                die(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 );
-            $w->sent = date('Y-m-d H:i:s');
+            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s') . " - FAILED -  BAD EMAIL - {$p->email} \n");
+            $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED -  BAD EMAIL - {$p->email} \n");
             
             
         }
@@ -301,19 +338,20 @@ class Pman_Core_NotifySend extends Pman
         
         
         if (!$force && strtotime($w->act_start) <  strtotime('NOW - 14 DAY')) {
-            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
-            $w->sent = date('Y-m-d H:i:s');
+            $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - GIVE UP - ". $p->email );
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') :$w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s') . " - FAILED -  GAVE UP TO OLD - {$p->email} \n");
+            $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED -  GAVE UP TO OLD - {$p->email} \n");
         }
         
         
         
         $w->to_email = $p->email; 
         //$this->addEvent('NOTIFY', $w, 'GREYLISTED ' . $p->email . ' ' . $res->toString());
-        $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+        // we can only update act_when if it has not been sent already (only happens when running in force mode..)
+        $w->act_when =  (!$w->act_when || $w->act_when == '0000-00-00 00:00:00') ? date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES')) : $w->act_when;
         $w->update($ww);
         
         $ww = clone($w);   
@@ -321,63 +359,143 @@ class Pman_Core_NotifySend extends Pman
         $fail = false;
         require_once 'Mail.php';
         
-        foreach($mxs as $dom) {
-            
-            
+        $core_domain = DB_DataObject::factory('core_domain');
+        if(!$core_domain->get('domain', $dom)){
+            $core_domain = DB_DataObject::factory('core_domain');
+            $core_domain->setFrom(array(
+                'domain' => $dom
+            ));
+            $core_domain->insert();
+        }
+                        
+        foreach($mxs as $mx) {
             
             if (!isset($ff->Mail['helo'])) {
-                die("config Mail[helo] is not set");
+                $this->errorHandler("config Mail[helo] is not set");
             }
-            
-            $this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
+            $this->debug_str = '';
+            $this->debug("Trying SMTP: $mx / HELO {$ff->Mail['helo']}");
             $mailer = Mail::factory('smtp', array(
-                    'host'    => $dom ,
+                    'host'    => $mx ,
                     'localhost' => $ff->Mail['helo'],
                     'timeout' => 15,
-                    'socket_options' =>  isset($ff->Mail['socket_options']) ? $ff->Mail['socket_options'] : null
-                  //  'debug' => true
+                    'socket_options' =>  isset($ff->Mail['socket_options']) ? $ff->Mail['socket_options'] : null,
+                    //'debug' => isset($opts['debug']) ?  1 : 0,
+                    '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'] == $mx && !empty($ff->Mail['auth'] )) {
+                
+                $username = $ff->Mail['username'] ;
+                $password = $ff->Mail['password'] ;
+                
+                if(!empty($ff->Core_Notify) && !empty($ff->Core_Notify['routes'])){
+                    
+                    foreach ($ff->Core_Notify['routes'] as $server => $settings){
+                        if(!in_array($dom, $settings['domains'])){
+                            continue;
+                        }
+                        
+                        // what's the minimum timespan.. - if we have 60/hour.. that's 1 every minute.
+                        // if it's newer that '1' minute...
+                        // then shunt it..
+                        
+                        $seconds = floor((60 * 60) / $settings['rate']);
+                        
+                        $core_notify = DB_DataObject::factory($this->table);
+                        $core_notify->domain_id = $core_domain->id;
+                        $core_notify->whereAdd("
+                            sent >= NOW() - INTERVAL $seconds SECONDS
+                        ");
+                        
+                        if($core_notify->count()){
+                            $old = clone($w);
+                            $w->act_when = date("Y-m-d H:i:s", time() + $seconds);
+                            $w->update($old);
+                            $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
+                        }
+                        
+                        // that make's this test obsolete...
+                        /*
+                        
+                        $core_notify = DB_DataObject::factory($this->table);
+                        $core_notify->domain_id = $core_domain->id;
+                        $core_notify->whereAdd("
+                            sent >= NOW() - INTERVAL 1 HOUR
+                        ");
+                        
+                        if($core_notify->count() >= $settings['rate']){
+                            $old = clone($w);
+                            $w->act_when = date("Y-m-d H:i:s", strtotime('+1 HOUR'));
+                            $w->update($old);
+                            $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
+                        }
+                        */
+                        
+                        
+                        
+                        $mailer->host = $server;
+                        $username = $settings['username'];
+                        $password = $settings['password'];
+                        
+                        break;
+                    }
+                    
+                }
+                
+                $mailer->auth = true;
+                $mailer->username = $username;
+                $mailer->password = $password;        
+            }
+            
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
              
             
             if ($res === true) {
                 // success....
                 
-                $ev = $this->addEvent('NOTIFYSENT', $w, "{$w->to_email} - {$email['headers']['Subject']}");
-               
+                $successEventName = (empty($email['successEventName'])) ? 'NOTIFYSENT' : $email['successEventName'];
+                
+                $ev = $this->addEvent($successEventName, $w, "{$w->to_email} - {$email['headers']['Subject']}");
                 
+                $ev->writeEventLog($this->debug_str);
                 
-                $w->sent = date('Y-m-d H:i:s');
+                if(strtotime($w->act_when) > strtotime("NOW")){
+                    $w->act_when = date('Y-m-d H:i:s');
+                }
+                
+                $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
                 $w->msgid = $email['headers']['Message-Id'];
                 $w->event_id = $ev->id; // sent ok.. - no need to record it..
+                $w->domain_id = $core_domain->id;
                 $w->update($ww);
                 
                 // enable cc in notify..
                 if (!empty($email['headers']['Cc'])) {
-                    $mailer = Mail::factory('smtp', array(
-                       //'host'    => $dom ,
-                      //  'debug' => true
-                    ));
+                    $cmailer = Mail::factory('smtp',  isset($ff->Mail) ? $ff->Mail : array() );
                     $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(
-                       //'host'    => $dom ,
-                      //  'debug' => true
-                    ));
+                    $cmailer = Mail::factory('smtp', isset($ff->Mail) ? $ff->Mail : array() );
                     $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
-                    $mailer->send($email['bcc'],
+                    $res = $cmailer->send($email['bcc'],
                                   $email['headers'], $email['body']);
-                    
+                    if (!$res || is_a($res, 'PEAR_Error')) {
+                        echo "could not send bcc..\n";
+                    } else {
+                        echo "Sent BCC to {$email['bcc']}\n";
+                    }
                 }
                 
-                $p->deliveredLog();
                 
-                die(date('Y-m-d h:i:s') . " - SENT\n");
+                $this->errorHandler(date('Y-m-d h:i:s') . " - SENT {$w->id} - {$w->to_email} \n", true);
             }
             // what type of error..
             $code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
@@ -394,50 +512,67 @@ 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";
+                $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 ' . $p->email . ' ' . $res->toString());
+                $this->addEvent('NOTIFY', $w, 'GREYLISTED - ' . $errmsg);
                 $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
+                $w->domain_id = $core_domain->id;
                 $w->update($ww);
-                die(date('Y-m-d h:i:s') . " - GREYLISTED\n");
+                
+                
+                $this->errorHandler(date('Y-m-d h:i:s') . " - GREYLISTED -  $errmsg \n");
             }
             $fail = true;
             break;
         }
         if ($fail || $next_try_min > (2*24*60)) {
         // fail.. = log and give up..
+            $errmsg=  $fail ? ($res->userinfo['smtpcode'] . ': ' .$res->toString()) :  " - UNKNOWN ERROR";
+            if (isset($res->userinfo['smtptext'])) {
+                $errmsg=  $res->userinfo['smtpcode'] . ':' . $res->userinfo['smtptext'];
+            }
+            
             $ev = $this->addEvent('NOTIFY', $w, ($fail ? "FAILED - " : "RETRY TIME EXCEEDED - ") .
-                        $p->email . ' ' .
-                        ($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) :  " - UNKNOWN ERROR"));
-            $w->sent = date('Y-m-d H:i:s');
+                       $errmsg);
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
+            $w->domain_id = $core_domain->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
+            $this->errorHandler(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
         }
         
         // handle no host availalbe forever...
         if (strtotime($w->act_start) < strtotime('NOW - 3 DAYS')) {
             $ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ". $p->email);
-            $w->sent = date('Y-m-d H:i:s');
+            $w->sent = (!$w->sent || $w->sent == '0000-00-00 00:00:00') ? $w->sqlValue('NOW()') : $w->sent; // do not update if sent.....
             $w->msgid = '';
             $w->event_id = $ev->id;
+            $w->domain_id = $core_domain->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
-            
-            
+            $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED - RETRY TIME EXCEEDED\n");
         }
         
         
         $this->addEvent('NOTIFY', $w, 'NO HOST CAN BE CONTACTED:' . $p->email);
         $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + 5 MINUTES'));
+        $w->domain_id = $core_domain->id;
         $w->update($ww);
-        die(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE\n");
+        $this->errorHandler(date('Y-m-d h:i:s') ." - NO HOST AVAILABLE\n");
 
         
     }
     function mxs($fqdn)
     {
+        $ff = HTML_FlexyFramework::get();
+        if (isset($ff->Pman_Core_NotifySend['host'])) {
+            return array($ff->Pman_Core_NotifySend['host']);
+        }
+        
         $mx_records = array();
         $mx_weight = array();
         $mxs = array();
@@ -473,16 +608,29 @@ class Pman_Core_NotifySend extends Pman
     function makeEmail($object, $rcpt, $last_sent_date, $notify, $force =false)
     {
         $m = 'notify'. $notify->evtype;
-        //var_dump($m);
-        
+        //var_dump(get_class($object) . '::' .$m);
         if (!empty($notify->evtype) && method_exists($object,$m)) {
+            echo "calling :" . get_class($object) . '::' .$m . "\n";
+            return $object->$m($rcpt, $last_sent_date, $notify, $force);
+        }
+        
+        $type = explode('::', $notify->evtype);
+        
+        if(!empty($type[1]) && method_exists($object,$type[1])){
+            $m = $type[1];
+            echo "calling :" . get_class($object) . '::' .$m . "\n";
             return $object->$m($rcpt, $last_sent_date, $notify, $force);
         }
                 
-        if (!method_exists($object, 'toEmail')) {
+        if (method_exists($object, 'toMailerData')) {
+            return $object->toMailerData(array(
+                'rcpts'=>$rcpt,
+                'person'=>$rcpt, // added as mediaoutreach used this?
+            )); //this is core_email - i think it's only used for testing...
             //var_Dump($object);
             //exit;
         }
+        
         return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
     }
     
@@ -496,6 +644,28 @@ class Pman_Core_NotifySend extends Pman
     }
     function output()
     {
-        die("done\n");
+        $this->errorHandler("done\n");
+    }
+    var $debug_str = '';
+    
+    function debugHandler ($smtp, $message)
+    {
+        $this->debug_str .= strlen($this->debug_str) ? "\n" : '';
+        $this->debug_str .= $message;
+    }
+    
+    function errorHandler($msg, $success = false)
+    {
+        if($this->error_handler == 'exception'){
+            if($success){
+                throw new Pman_Core_NotifySend_Exception_Success($msg);
+            }
+            
+            throw new Pman_Core_NotifySend_Exception_Fail($msg);
+        }
+        
+        die($msg);
+        
+        
     }
 }
\ No newline at end of file