DataObjects/Core_person_signup.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 73d67f9..f53971a 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -18,8 +18,13 @@ 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.
  */
 
 
@@ -63,11 +68,13 @@ 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;
@@ -77,10 +84,11 @@ class Pman_Core_NotifySend extends Pman
     function get($id,$opts)
     {
         
-        print_r($opts);
-        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;
@@ -89,12 +97,12 @@ class Pman_Core_NotifySend extends Pman
         $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);
@@ -108,7 +116,7 @@ class Pman_Core_NotifySend extends Pman
                 $w->sent = $w->sqlValue("NOW()");
                 $w->update($ww);
             }    
-            die("message has been sent already.\n");
+            $this->errorHandler("message has been sent already.\n");
         }
         
         $o = $w->object();
@@ -122,7 +130,7 @@ class Pman_Core_NotifySend extends Pman
             $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");
         }
@@ -139,10 +147,10 @@ class Pman_Core_NotifySend extends Pman
             $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");
         }
         
         
@@ -185,7 +193,7 @@ class Pman_Core_NotifySend extends Pman
             $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");
         }
@@ -201,7 +209,7 @@ class Pman_Core_NotifySend extends Pman
             $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");
@@ -212,7 +220,7 @@ class Pman_Core_NotifySend extends Pman
             $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");
         }
         
          
@@ -244,7 +252,7 @@ class Pman_Core_NotifySend extends Pman
             $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");
             
         }
         
@@ -280,10 +288,10 @@ 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') . " - GREYLISTED\n");
             }
             
             $ev = $this->addEvent('NOTIFY', $w, "BAD ADDRESS - ". $p->email );
@@ -291,7 +299,7 @@ class Pman_Core_NotifySend extends Pman
             $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");
             
             
         }
@@ -305,7 +313,7 @@ class Pman_Core_NotifySend extends Pman
             $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");
         }
         
         
@@ -325,16 +333,18 @@ class Pman_Core_NotifySend extends Pman
             
             
             if (!isset($ff->Mail['helo'])) {
-                die("config Mail[helo] is not set");
+                $this->errorHandler("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' => $opts['debug'],
+                    //'debug' => isset($opts['debug']) ?  1 : 0,
+                    'debug' => 1,
+                    'debug_handler' => array($this, 'debugHandler')
                 ));
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
              
@@ -343,8 +353,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'];
@@ -375,7 +385,7 @@ class Pman_Core_NotifySend extends Pman
                 }
                 
                 
-                die(date('Y-m-d h:i:s') . " - SENT\n");
+                $this->errorHandler(date('Y-m-d h:i:s') . " - SENT\n");
             }
             // what type of error..
             $code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
@@ -400,7 +410,7 @@ class Pman_Core_NotifySend extends Pman
                 $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");
+                $this->errorHandler(date('Y-m-d h:i:s') . " - GREYLISTED\n");
             }
             $fail = true;
             break;
@@ -418,7 +428,7 @@ class Pman_Core_NotifySend extends Pman
             $w->msgid = '';
             $w->event_id = $ev->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...
@@ -428,7 +438,7 @@ class Pman_Core_NotifySend extends Pman
             $w->msgid = '';
             $w->event_id = $ev->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");
             
             
         }
@@ -437,12 +447,17 @@ class Pman_Core_NotifySend extends Pman
         $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->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();
@@ -510,6 +525,24 @@ 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)
+    {
+        if($this->error_handler == 'exception'){
+            throw new Exception($msg);
+        }
+        
+        die($msg);
+        
+        
     }
 }
\ No newline at end of file