NotifySend.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 39aa4a6..f53bea6 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -356,6 +356,15 @@ class Pman_Core_NotifySend extends Pman
         $fail = false;
         require_once 'Mail.php';
         
+        $core_domain = DB_DataObject::factory($core_domain);
+        if(!$core_domain->get('domain', $dom)){
+            $core_domain = DB_DataObject::factory($core_domain);
+            $core_domain->setFrom(array(
+                'domain' => $dom
+            ));
+            $core_domain->insert();
+        }
+                        
         foreach($mxs as $mx) {
             
             if (!isset($ff->Mail['helo'])) {
@@ -387,15 +396,6 @@ class Pman_Core_NotifySend extends Pman
                             continue;
                         }
                         
-                        $core_domain = DB_DataObject::factory($core_domain);
-                        if(!$core_domain->get('domain', $dom)){
-                            $core_domain = DB_DataObject::factory($core_domain);
-                            $core_domain->setFrom(array(
-                                'domain' => $dom
-                            ));
-                            $core_domain->insert();
-                        }
-                        
                         $core_notify = DB_DataObject::factory('core_notify');
                         $core_notify->domain_id = $core_domain->id;
                         $core_notify->whereAdd("
@@ -403,14 +403,16 @@ class Pman_Core_NotifySend extends Pman
                         ");
                         
                         if($core_notify->count() >= $settings['rate']){
-                            
+                            $old = clone($w);
+                            $w->act_when = date("Y-m-d H:i:s", strtotime('+1 HOUR'));
+                            $w->update($old);
+                            $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
                         }
                         
                         $mailer->host = $server;
                         $username = $settings['username'];
                         $password = $settings['password'];
                         
-                        
                         break;
                     }
                     
@@ -434,6 +436,7 @@ class Pman_Core_NotifySend extends Pman
                 $w->sent = date('Y-m-d H:i:s');
                 $w->msgid = $email['headers']['Message-Id'];
                 $w->event_id = $ev->id; // sent ok.. - no need to record it..
+                $w->domain_id = 
                 $w->update($ww);
                 
                 // enable cc in notify..