new settings section

core/Helper/DnsHelper.php

@@ -26,66 +26,6 @@ class DnsHelper
         $this->resolver = new \Net_DNS2_Resolver(array('nameservers' => $this->nameserver));
     }    
 
-    public function getMX($domain){
-            try {
-                    $result = $this->resolver->query($domain, 'MX');
-                    
-            } catch(\Net_DNS2_Exception $e) {
-                    
-                    echo "::query() failed: ", $e->getMessage(), "\n";
-            }
-            $domainMX = $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';
-                }
-            }
-        return $vars;
-    }
-
-    public function getSPF($domain){
-        try {
-                $result = $this->resolver->query($domain, 'MX');
-                
-        } catch(\Net_DNS2_Exception $e) {
-                
-                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 {
-            $vars['domainMX'] = $domainMX;
-            $domainMXrecord = array_shift($domainMX);
-            $vars['mxtarget'] = $domainMXrecord->exchange;
-            if($domainMXrecord->exchange == $this->params['serverhostname']) {
-                $vars['mx'] = 'set';
-            } else {
-                $var['mx'] = 'wrong';
-            }
-        }
-        return $vars;
-    }
-
     public function getRecords($domain) {
         $zoneID = $this->selfDns($domain);
         if($zoneID) {
@@ -94,7 +34,7 @@ class DnsHelper
         return $this->getResolverRecords($domain);
     }
 
-    public function getResolverRecords($domain)
+    private function getResolverRecords($domain)
     {
         $vars['mx'] = array();
         $vars['spf'] = array();
@@ -126,19 +66,10 @@ class DnsHelper
                 }
             }
         }
-
-            logModuleCall(
-                'kerioEmail',
-                __FUNCTION__,
-                $vars,
-                'DEbug',
-                $domain
-            );
-
         return $vars;
     }
     
-    public function selfDns($domain){
+    private function selfDns($domain){
         $zoneIDcollection = Capsule::table('dns_manager2_zone')
             ->select('id')
             ->where('name', '=', $domain)
@@ -150,7 +81,7 @@ class DnsHelper
         return $zoneIDobj->{'id'};
     }
 
-    public function getLocalRecords($zoneID) {
+    private function getLocalRecords($zoneID) {
         $dnsZone = localAPI('dnsmanager', array( 'dnsaction' => 'getZone', 'zone_id' => $zoneID));
         if($dnsZone['result'] != 'success') {
             return 'Error: cloud not fetch zone for ID ' . $zoneID;
@@ -172,6 +103,7 @@ class DnsHelper
         }
         return $zoneRecords;
     }
+    
     function KerioEmailsetDNS()
     {
         return 'success';