DataObjects/Core_person_signup.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 2b8964c..9f5d227 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -76,6 +76,8 @@ class Pman_Core_NotifySend extends Pman
    
     function get($id,$opts)
     {
+        
+        //print_r($opts);
         if ($opts['DB_DataObject-debug']) {
             DB_DataObject::debugLevel($opts['DB_DataObject-debug']);
         }
@@ -128,7 +130,7 @@ class Pman_Core_NotifySend extends Pman
         
         
         $p = $w->person();
-        print_r('run');exit;
+        
         if (isset($p->active) && empty($p->active)) {
             $ev = $this->addEvent('NOTIFY', $w,
                             "Notification event cleared (not user not active any more)" );;
@@ -174,7 +176,6 @@ class Pman_Core_NotifySend extends Pman
         // this may modify $p->email. (it will not update it though)
         $email =  $this->makeEmail($o, $p, $last, $w, $force);
         
-        
         if ($email === true)  {
             
             $ev = $this->addEvent('NOTIFY', $w,
@@ -207,9 +208,6 @@ class Pman_Core_NotifySend extends Pman
         }
         
         
-        
-        
-        
         if (isset($email['later'])) {
             $old = clone($w);
             $w->act_when = $email['later'];
@@ -238,7 +236,6 @@ class Pman_Core_NotifySend extends Pman
         $p->email = trim($p->email);
         
         
-        //print_r($p);
         require_once 'Validate.php';
         if (!Validate::email($p->email, true)) {
             $ev = $this->addEvent('NOTIFY', $w, "INVALID ADDRESS: " . $p->email);
@@ -330,14 +327,16 @@ class Pman_Core_NotifySend extends Pman
             if (!isset($ff->Mail['helo'])) {
                 die("config Mail[helo] is not set");
             }
-            
+            $this->debug_str = '';
             $this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
             $mailer = Mail::factory('smtp', array(
                     'host'    => $dom ,
                     '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')
                 ));
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
              
@@ -346,8 +345,8 @@ class Pman_Core_NotifySend extends Pman
                 // success....
                 
                 $ev = $this->addEvent('NOTIFYSENT', $w, "{$w->to_email} - {$email['headers']['Subject']}");
-               
                 
+                $ev->writeEventLog($this->debug_str);
                 
                 $w->sent = date('Y-m-d H:i:s');
                 $w->msgid = $email['headers']['Message-Id'];
@@ -395,9 +394,12 @@ 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=  $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->update($ww);
                 die(date('Y-m-d h:i:s') . " - GREYLISTED\n");
@@ -407,9 +409,13 @@ class Pman_Core_NotifySend extends Pman
         }
         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"));
+                       $errmsg);
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
             $w->event_id = $ev->id;
@@ -474,9 +480,17 @@ 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);
         }
                 
@@ -484,6 +498,7 @@ class Pman_Core_NotifySend extends Pman
             //var_Dump($object);
             //exit;
         }
+        
         return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
     }
     
@@ -499,4 +514,11 @@ class Pman_Core_NotifySend extends Pman
     {
         die("done\n");
     }
+    var $debug_str = '';
+    
+    function debugHandler ($smtp, $message)
+    {
+        $this->debug_str .= strlen($this->debug_str) ? "\n" : '';
+        $this->debug_str .= $message;
+    }
 }
\ No newline at end of file