- foreach ($ff->Core_Notify['routes'] as $server => $settings){
- if(!in_array($dom, $settings['domains'])){
- continue;
- }
-
- // what's the minimum timespan.. - if we have 60/hour.. that's 1 every minute.
- // if it's newer that '1' minute...
- // then shunt it..
-
- $seconds = floor((60 * 60) / $settings['rate']);
-
- $core_notify = DB_DataObject::factory($this->table);
- $core_notify->domain_id = $core_domain->id;
- $core_notify->whereAdd("
- sent >= NOW() - INTERVAL $seconds SECONDS
- ");
-
- if($core_notify->count()){
- $old = clone($w);
- $w->act_when = date("Y-m-d H:i:s", time() + $seconds);
- $w->update($old);
- $this->errorHandler(date('Y-m-d h:i:s ') . " Too many emails sent by {$dom}");
- }
-
- // that make's this test obsolete...
- /*
-
- $core_notify = DB_DataObject::factory($this->table);
- $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}");
- }
- */
-
-
-
- $mailer->host = $server;
- $username = $settings['username'];
- $password = $settings['password'];
+ // what's the minimum timespan.. - if we have 60/hour.. that's 1 every minute.
+ // if it's newer that '1' minute...
+ // then shunt it..
+
+ $settings['rate'] = isset( $settings['rate']) ? $settings['rate'] : 360;
+
+ $seconds = floor((60 * 60) / $settings['rate']);
+
+ $core_notify = DB_DataObject::factory($this->table);
+ $core_notify->domain_id = $core_domain->id;
+ $core_notify->server_id = $this->server->id;
+ $core_notify->whereAdd("
+ sent >= NOW() - INTERVAL $seconds SECOND
+ ");
+
+ if($core_notify->count()){
+ $this->server->updateNotifyToNextServer( $w , date("Y-m-d H:i:s", time() + $seconds), true);
+ $this->errorHandler( " Too many emails sent by {$dom} - requeing");
+ }
+
+
+
+ $mailer->host = $server;
+ $mailer->auth = isset($settings['auth']) ? $settings['auth'] : true;
+ $mailer->username = $settings['username'];
+ $mailer->password = $settings['password'];
+ if (isset($settings['port'])) {
+ $mailer->port = $settings['port'];
+ }
+ if (isset($settings['socket_options'])) {
+ $mailer->socket_options = $settings['socket_options'];