DataObjects/Core_notify_recur.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 9440ac9..cea5c70 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -94,6 +94,10 @@ class Pman_Core_NotifySend extends Pman
             
             die("send repeat to early\n");
         }
+        if (!empty($opts['debug'])) {
+            print_r($w);
+        }
+        
         
         if (!$force && !empty($w->msgid)) {
             $ww = clone($w);
@@ -276,7 +280,7 @@ class Pman_Core_NotifySend extends Pman
             if ($res === true) {
                 // success....
                 
-                $ev = $this->addEvent('NOTIFY', $w, 'SUCCESS: ' .$email['headers']['Subject']);
+                $ev = $this->addEvent('NOTIFYSENT', $w, "{$w->to_email} - {$email['headers']['Subject']}");
                
                 
                 
@@ -393,9 +397,17 @@ class Pman_Core_NotifySend extends Pman
          
      }
      **/
-    function makeEmail($object, $rcpt, $last_sent_date, $notify)
+    function makeEmail($object, $rcpt, $last_sent_date, $notify, $force =false)
     {
-        return $object->toEmail($rcpt, $last_sent_date, $notify);
+        $m = 'notify'. $notify->evtype;
+        var_dump($m);
+        
+        if (!empty($notify->evtype) && method_exists($object,$m)) {
+            return $object->$m($rcpt, $last_sent_date, $notify, $force);
+        }
+                
+        
+        return $object->toEmail($rcpt, $last_sent_date, $notify, $force);
     }
     
     function debug($str)