new dns helper class

core/Helper/DnsHelper.php

@@ -2,8 +2,6 @@
 
 namespace ThurData\Servers\KerioEmail\Core\Helper;
 
-use ThurData\Servers\KerioEmail\App\Traits\ServerParams;
-
 require_once '/usr/share/php/Net/DNS2.php';
 use \Net\DNS2\Net_DNS2_Resolver as Net_DNS2_Resolver;
 
@@ -14,33 +12,25 @@ use \Net\DNS2\Net_DNS2_Resolver as Net_DNS2_Resolver;
  */
 class DnsHelper
 {
-    const NS1 = '185.163.51.130';
-    const NS2 = '185.163.51.131';
     const SPF = 'v=spf1 mx a:mail3.seecure.ch ip4:185.163.51.0/24 ip4:89.35.78.0/23 ~all';
     const DMARC = 'v=DMARC1; p=reject; rua=mailto:technik@thurdata.ch; ruf=mailto:technik@thurdata.ch';
-    use ServerParams;
-    public function KerioEmailCheckDNS($params)
+    public static function KerioEmailCheckDNS($params, $nameserver)
     {
-        unset($zoneID);
-        unset($mxStatus);
-        unset($dnsData);
-        unset($vars);
-        $vars['maildomain'] = $params['domain'];
-        $clientDomains = localAPI('GetClientsDomains', array('clientid' => $params['userid']));
-        $serverParams = $this->getServerParamsByHostingId($params['serviceid']);
 
         logModuleCall(
     		'kerioEmail',
 	    	__FUNCTION__,
-		    $params,
+            $params,
     		'Debug',
-	    	$serverParams
+	    	$nameserver
     	);
 
-        $nameserver = array(
-            NS1,
-            NS2);
-        
+        unset($zoneID);
+        unset($mxStatus);
+        unset($dnsData);
+        unset($vars);
+        $vars['maildomain'] = $params['domain'];
+        $clientDomains = localAPI('GetClientsDomains', array('clientid' => $params['userid']));
         $resolver = new \Net_DNS2_Resolver(array('nameservers' => $nameserver));
         try {
                 $result = $resolver->query($params['domain'], 'MX');

core/Http/Response.php

@@ -165,11 +165,11 @@ class Response extends SymfonyRespose
         $action = $pageController->getControllerMethod();
 
         $mainMenu = DependencyInjection::create(MainMenu::class)->buildBreadcrumb($controller,  $action, []);
-        $dns = new DnsHelper();
         $menu = $mainMenu->getMenu();
 
         $addon = ServiceLocator::call(Config::class);
         $server = Server::select('id', 'nameserver1ip', 'nameserver2ip')->findOrFail($this->getWhmcsParamByKey('serverid'));
+        $nameserver = array([trim($server->nameserver1ip), trim($server->nameserver1ip)]);
         $params = $this->getWhmcsParamsByKeys(['domain', 'userid', 'serverhostname', 'nameserver1ip']);
         $vars = [
             'assetsURL'                => BuildUrl::getAssetsURL(),
@@ -190,17 +190,8 @@ class Response extends SymfonyRespose
             'tagImageModule'           => $addon->getConfigValue('moduleIcon'),
             'isDebug'                  => (bool)((int)$addon->getConfigValue('debug', "0")),
             'errorPageDetails'         => $this->getErrorPageData($responseResolver),
-            'dnsvars'                  => $dns->KerioEmailCheckDNS($params)
+            'dnsvars'                  => DnsHelper::KerioEmailCheckDNS($params,$nameserver)
         ];
-
-        logModuleCall(
-    		'kerioEmail',
-	    	__FUNCTION__,
-            $params,
-    		'Debug',
-	    	$server
-    	);
-
         try
         {
             $this->loadLangContext();