Pman.Dialog.CoreCompanies.bjs

[Pman.Core] / NotifySend.php

diff --git a/NotifySend.php b/NotifySend.php
index 33b8586..07c1e9f 100644 (file)
--- a/NotifySend.php
+++ b/NotifySend.php
@@ -103,9 +103,8 @@ class Pman_Core_NotifySend extends Pman
         }
 
         if (!$force && !empty($w->sent) && strtotime($w->act_when) < strtotime($w->sent)) {
-            
-            
-            $this->errorHandler("send repeat to early\n");
+             
+            $this->errorHandler("already sent - repeat to early\n");
         }
         if (!empty($opts['debug'])) {
             print_r($w);
@@ -335,14 +334,14 @@ class Pman_Core_NotifySend extends Pman
             $retry = 240;
         }
         
-        if ($mxs === false) {
+        if (empty($mxs)) {
             // only retry for 1 day if the MX issue..
             if ($retry < 240) {
                 $this->addEvent('NOTIFY', $w, 'MX LOOKUP FAILED ' . $dom );
                 $w->act_when = date('Y-m-d H:i:s', strtotime('NOW + ' . $retry . ' MINUTES'));
                 $this->updateServer($w);
                 $w->update($ww);
-                $this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED\n");
+                $this->errorHandler(date('Y-m-d h:i:s') . " - MX LOOKUP FAILED {$dom}\n");
             }
             
             $ev = $this->addEvent('NOTIFYFAIL', $w, "BAD ADDRESS - BAD DOMAIN - ". $p->email );
@@ -351,7 +350,7 @@ class Pman_Core_NotifySend extends Pman
             $w->event_id = $ev->id;
             $w->to_email = $p->email; 
             $w->update($ww);
-            $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED -  BAD EMAIL - {$p->email} \n");
+            $this->errorHandler(date('Y-m-d h:i:s') . " - FAILED -  BAD DOMAIN - {$p->email} \n");
             
             
         }
@@ -618,9 +617,11 @@ class Pman_Core_NotifySend extends Pman
         asort($mx_weight,SORT_NUMERIC);
         
         foreach($mx_weight as $k => $weight) {
-            $mxs[] = $mx_records[$k];
+            if (!empty($mx_records[$k])) {
+                $mxs[] = $mx_records[$k];
+            }
         }
-        return $mxs;
+        return empty($mxs) ? false : $mxs;
     }
     
     /**
@@ -709,6 +710,10 @@ class Pman_Core_NotifySend extends Pman
         if (empty($ff->Core_Notify['servers'])) {
             return;
         }
+        // some classes dont support server routing
+        if (!property_exists($w, 'server_id')) {
+            return;
+        }
         // next server..
         $w->server_id = ($w->server_id + 1) % count(array_keys($ff->Core_Notify['servers']));
          
@@ -717,6 +722,14 @@ class Pman_Core_NotifySend extends Pman
      function initHelo()
     {
         $ff = HTML_FlexyFramework::get();
+        
+        if (isset($ff->Core_Notify['servers-non-pool'])  &&
+            isset($ff->Core_Notify['servers-non-pool'][gethostname()]) &&
+            isset($ff->Core_Notify['servers-non-pool'][gethostname()]['helo']) ) {
+            $ff->Mail['helo'] = $ff->Core_Notify['servers-non-pool'][gethostname()]['helo'];
+            return;
+        }
+        
         if (empty($ff->Core_Notify['servers'])) {
             return;
         }