DataObjects/Core_person_signup.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 4d4e222..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']);
         }
@@ -325,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']);
              
@@ -341,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'];
@@ -477,15 +481,17 @@ class Pman_Core_NotifySend extends Pman
     {
         $m = 'notify'. $notify->evtype;
         //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);
         }
         
-        if(!empty($notify->evtype) && $notify->evtype == 'campaign_detail::drawWinner'){
-            echo "calling :" . $notify->evtype . "\n";
-            return $object->drawWinner($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')) {
@@ -508,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