andre 5 месяцев назад
Родитель
Сommit
45b4e94389
1 измененных файлов с 15 добавлено и 20 удалено
  1. 15 20
      core/Helper/DnsHelper.php

+ 15 - 20
core/Helper/DnsHelper.php

@@ -106,33 +106,28 @@ class DnsHelper
         }
         $domainMX = $responseMX->answer;
         $domainTXT = $responseTXT->answer;
+        if(empty($domainMX)){
+            $vars['mx'] = [ 'status' => 'unset', 'target' => 'none'];
+        } else {
+
+            foreach($domainMX as $mxRecord) {
+                if($mxRecord->exchange == $this->params['serverhostname']) {
+                    array_push($vars['mx'], [ 'status' => 'set','target' => $mxRecord->exchange]);
+                }
+            }
+            if(empty($vars['mx'])){
+                $vars['mx'] = [ 'status' => 'wrong', 'target' => $mxRrecord->exchange];
+            }
+        }
 
             logModuleCall(
                 'kerioEmail',
                 __FUNCTION__,
-                $domainMX,
+                $vars['mx'],
                 'DEbug',
-                $domainTXT
+                $domain
             );
 
-        if(empty($domainMX)){
-            $vars['mx'] = 'unset';
-            $vars['mxtarget'] = $this->params['serverhostname'];
-        } else {
-            if(count($domainMX) > 1) {
-                $vars['multiMX'] = TRUE;
-            } else {
-                $vars['multiMX'] = FALSE;
-            }
-            $vars['domainMX'] = $domainMX;
-            $domainMXrecord = array_shift($domainMX);
-            $vars['mxtarget'] = $domainMXrecord->exchange;
-            if($domainMXrecord->exchange == $this->params['serverhostname']) {
-                $vars['mx'] = 'set';
-            } else {
-                $var['mx'] = 'wrong';
-            }
-        }
         $domainSPF = array();
         $domainDMARC = array();
         $domainDKIM = array();