new settings section

app/UI/Client/Setting/Pages/Settings.php

@@ -170,8 +170,9 @@ class Settings extends DataTable implements ClientArea
         foreach($domains as $domain){
             in_array($domain,$clientDomains) ? $selfdomain = 'active' : $selfdomain = 'inactive';
             $dns->selfDns($domain) ? $selfDns = 'active' : $selfDns = 'inactive';
-            $dnsRecords = $dns->getRecords($domain);
+            $dnsRecords = $dns->getMX($domain);
             $dnsRecords['mx'] == 'set' ? $mx = 'active' : $mx = 'inactive';
+            $dnsRecords = $dns->getTxtRecords($domain);
             $dnsRecords['spf'] == 'set' ? $spf = 'active' : $spf = 'inactive';
             $dnsRecords['dmarc'] == 'set' ? $dmarc = 'active' : $dmarc = 'inactive';
             $dnsRecords['dkim'] == 'set' ? $dkim = 'active' : $dkim = 'inactive';

core/Helper/DnsHelper.php

@@ -35,15 +35,15 @@ class DnsHelper
                 echo "::query() failed: ", $e->getMessage(), "\n";
         }
         $domainMX = $result->answer;
-        if(count($domainMX) > 1) {
-            $vars['multiMX'] = TRUE;
-        } else {
-            $vars['multiMX'] = FALSE;
-        }
         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;
@@ -86,25 +86,8 @@ class DnsHelper
         return $vars;
     }
 
-    public function getRecords($domain)
+    public function getTxtRecords($domain)
     {
-        try {
-                $result = $this->resolver->query($domain, 'MX');
-                
-        } catch(\Net_DNS2_Exception $e) {
-                
-                echo "::query() failed: ", $e->getMessage(), "\n";
-        }
-        $domainMX = $result->answer;
-
-        logModuleCall(
-            'kerioEmail',
-            __FUNCTION__,
-            $domainMX,
-            'Debug Settings',
-            $result->answer
-        );
-
         try {
             $result = $this->resolver->query($domain, 'TXT');
             
@@ -114,25 +97,6 @@ class DnsHelper
         }
         $domainTXT = $result->answer;
 
-        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();