DataObjects/Core_person_signup.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 74a209f..9f5d227 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -327,17 +327,16 @@ class Pman_Core_NotifySend extends Pman
             if (!isset($ff->Mail['helo'])) {
                 die("config Mail[helo] is not set");
             }
-            $debug_str = '';
+            $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' => isset($opts['debug']) ?  1 : 0,
-                    'debug_handler' => function($net_smtp, $message) uses ($debug_str) {
-                        $debug_str += $message;
-                    }
+                    //'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'];
@@ -515,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