NotifySend.php

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 688d4d0..e7e1e46 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -398,9 +398,16 @@ class Pman_Core_NotifySend extends Pman
                         
                         $core_notify = DB_DataObject::factory('core_notify');
                         $core_notify->domain_id = $core_domain->id;
+                        $core_notify->whereAdd("
+                            sent >= NOW - INTERVAL 1 HOUR
+                        ");
                         
                         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}");
+                            return;
                         }
                         
                         $mailer->host = $server;