sql/Person.sql

[Pman.Core] / NotifySmtpCheck.php

diff --git a/NotifySmtpCheck.php b/NotifySmtpCheck.php
index 1de2f94..bf0880c 100644 (file)
--- a/NotifySmtpCheck.php
+++ b/NotifySmtpCheck.php
@@ -27,31 +27,13 @@ class Pman_Core_NotifySmtpCheck extends Pman
             return;
         }
         
-        $ifconfig = file_get_contents("https://ifconfig.co/");
-        $dom = new DomDocument('1.0', 'utf-8');
-        $dom->loadHTML($ifconfig);
-        
-        $xpath = new DOMXPath($dom);
-        
-        $element = $xpath->query("//code[@class='ip']");
-        
-        if(!$element->length){
-            return;
-        }
-        
-        $ip = $element->item(0)->nodeValue;
-        
-        $cmd = "host {$ip}";
-        
-        $e = `$cmd`;
-        
-        $helo = substr(array_pop(explode(' ', $e)), 0, -2);
+        $helo = $this->getHelo();
         
         $error = array();
         
         foreach ($ff->Core_Notify['routes'] as $server => $settings){
             if(empty($settings['domains']) || empty($settings['username']) || empty($settings['password'])){
-                $error[] = "{$server} missing domains / username / password";
+                $error[] = "{$server} - Missing domains / username / password";
                 continue;
             }
             
@@ -72,22 +54,45 @@ class Pman_Core_NotifySmtpCheck extends Pman
                 $res = $smtp->connect(10);
                 
                 if (is_a($res, 'PEAR_Error')) {
-                    die("Cound not connect to {$server}");
+                    $error[] = "{$server} - Cound not connect";
+                    continue;
                 }
                 
                 $res = $smtp->auth($settings['username'], $settings['password']);
             
                 if (is_a($res, 'PEAR_Error')) {
-                    die($res);
+                    $error[] = "{$server} - Cound not login";
+                    continue;
                 }
-                
-                print_R("SUCCESS? {$res} \n");
-                exit;
-                   
             }
-            
-            
         }
+        
+        print_r($error);exit;
+    }
+    
+    function getHelo()
+    {
+        $ifconfig = file_get_contents("https://ifconfig.co/");
+        $dom = new DomDocument('1.0', 'utf-8');
+        $dom->loadHTML($ifconfig);
+        
+        $xpath = new DOMXPath($dom);
+        
+        $element = $xpath->query("//code[@class='ip']");
+        
+        if(!$element->length){
+            return;
+        }
+        
+        $ip = $element->item(0)->nodeValue;
+        
+        $cmd = "host {$ip}";
+        
+        $e = `$cmd`;
+        
+        $helo = substr(array_pop(explode(' ', $e)), 0, -2);
+        
+        return $helo;
     }
     
 }
\ No newline at end of file