DataObjects/ProjectDirectory.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 76627b0..9c6cd02 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -77,7 +77,7 @@ class Pman_Core_NotifySend extends Pman
     function get($id,$opts)
     {
         if ($opts['DB_DataObject-debug']) {
-            DB_DataObject::debugLevel($opts['debug']);
+            DB_DataObject::debugLevel($opts['DB_DataObject-debug']);
         }
         //DB_DataObject::debugLevel(1);
         //date_default_timezone_set('UTC');
@@ -132,23 +132,44 @@ class Pman_Core_NotifySend extends Pman
         
         $email =  $this->makeEmail($o, $p, $last, $w);
         
-        if ($email === false) {
-            // object returned 'false' - it does not know how to send it..
-            $id = $this->addEvent('NOTIFY', $w, "INTERNAL ERROR  - We can not handle " . $w->ontable
-                        $p->email . ' ' .
-                         ));
+        
+        if ($email === true)  {
+            
+            $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->msgid = '';
-            $w->event_id = $id;
+            $w->event_id = $ev->id;
             $w->update($ww);
-            die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
-            
-            
+            die(date('Y-m-d h:i:s ') . 
+                     "Notification event cleared (not required any more)" 
+                    ."\n");
         }
+     
         
+        if ($email === false || isset($email['error'])) {
+            // 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->msgid = '';
+            $w->event_id = $ev->id;
+            $w->update($ww);
+            die(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");
+        }
         
-        
-        
+         
         if (!isset($email['headers']['Message-Id'])) {
             $HOST = gethostname();
             $email['headers']['Message-Id'] = "<{$this->table}-{$id}@{$HOST}>";
@@ -157,11 +178,12 @@ class Pman_Core_NotifySend extends Pman
         //$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..
-        
+        // --send-to=test@xxx.com
         if (!empty($opts['send-to'])) {
             $p->email = $opts['send-to'];
         }
         
+        $ff = HTML_FlexyFramework::get();
         
         $dom = array_pop(explode('@', $p->email));
         
@@ -172,23 +194,51 @@ class Pman_Core_NotifySend extends Pman
         require_once 'Mail.php';
         
         foreach($mxs as $dom) {
-            $this->debug("Trying SMTP: $dom");
+            
+            
+            
+            if (!isset($ff->Mail['helo'])) {
+                die("config Mail[helo] is not set");
+            }
+            
+            $this->debug("Trying SMTP: $dom / HELO {$ff->Mail['helo']}");
             $mailer = Mail::factory('smtp', array(
                     'host'    => $dom ,
+                    'localhost' => $ff->Mail['helo'],
                   //  'debug' => true
                 ));
             $res = $mailer->send($p->email, $email['headers'], $email['body']);
             if ($res === true) {
                 // success....
                 
+                $ev = $this->addEvent('NOTIFY', $w, 'SUCCESS: ' .$email['headers']['Subject']);
+               
+                
+                
                 $w->sent = date('Y-m-d H:i:s');
                 $w->msgid = $email['headers']['Message-Id'];
-                $w->event_id = -1; // sent ok.. - no need to record it..
+                $w->event_id = $ev->id; // sent ok.. - no need to record it..
                 $w->update($ww);
+                
+                // enable cc in notify..
+                if (!empty($email['headers']['Cc'])) {
+                    $mailer = Mail::factory('smtp', array(
+                       //'host'    => $dom ,
+                      //  'debug' => true
+                    ));
+                    $email['headers']['Subject'] = "(CC): " . $email['headers']['Subject'];
+                    $mailer->send($email['headers']['Cc'],
+                                  $email['headers'], $email['body']);
+                    
+                }
+                
+                
+                
+                
                 die(date('Y-m-d h:i:s') . " - SENT\n");
             }
             // what type of error..
-            $code = empty($res->smtpcode) ? -1 : $res->smtpcode;
+            $code = empty($res->userinfo['smtpcode']) ? -1 : $res->userinfo['smtpcode'];
             if ($code < 0) {
                 continue; // try next mx... ??? should we wait??? - nope we did not even connect..
             }
@@ -206,12 +256,12 @@ class Pman_Core_NotifySend extends Pman
         }
         if ($fail || $next_try_min > (2*24*60)) {
         // fail.. = log and give up..
-            $id = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
+            $ev = $this->addEvent('NOTIFY', $w, "RETRY TIME EXCEEDED - ".
                         $p->email . ' ' .
-                        ($fail ? ($res->smtpcode . ' : ' .$res->toString()) :  " - UNKNOWN ERROR"));
+                        ($fail ? ($res->userinfo['smtpcode'] . ' : ' .$res->toString()) :  " - UNKNOWN ERROR"));
             $w->sent = date('Y-m-d H:i:s');
             $w->msgid = '';
-            $w->event_id = $id;
+            $w->event_id = $ev->id;
             $w->update($ww);
             die(date('Y-m-d h:i:s') . ' - FAILED - '. ($fail ? $res->toString() : "RETRY TIME EXCEEDED\n"));
         }
@@ -242,11 +292,21 @@ class Pman_Core_NotifySend extends Pman
     
     /**
      * wrapper to call object->toEmail()
-     * 
+     *
+     * return
+     *   {
+        headers : {AssocArray},
+        body: {String}
+        
+        // optional..
+        error :  {String} // error message in log.
+        send-to: {String} // use to override rcpt
+         
+     }
      **/
-    function makeEmail($o, $p, $last, $notify)
+    function makeEmail($object, $rcpt, $last_sent_date, $notify)
     {
-        return $o->toEmail($p,$last, $notify);
+        return $object->toEmail($rcpt, $last_sent_date, $notify);
     }
     
     function debug($str)