new check_configure_kerio_buisness_mail.tpl

core/Helper/DnsHelper.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace ThurData\Servers\KerioEmail\Core\Helper;
+use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Server;
 
 require_once '/usr/share/php/Net/DNS2.php';
 use \Net\DNS2\Net_DNS2_Resolver as Net_DNS2_Resolver;
@@ -12,6 +13,7 @@ use \Net\DNS2\Net_DNS2_Resolver as Net_DNS2_Resolver;
  */
 class DnsHelper
 {
+    use \ThurData\Servers\KerioEmail\Core\UI\Traits\WhmcsParams;
     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';
     public static function KerioEmailCheckDNS($params, $nameserver)
@@ -21,6 +23,9 @@ class DnsHelper
         unset($dnsData);
         unset($vars);
         $vars['maildomain'] = $params['domain'];
+        $params = WhmcsParams::getWhmcsParamsByKeys(['domain', 'userid', 'serverhostname', 'domainid', 'serverid']);
+        $server = Server::select('id', 'nameserver1ip', 'nameserver2ip')->findOrFail($params['serverid']);
+        $nameserver = array(trim($server->nameserver1ip), trim($server->nameserver2ip));
         $clientDomains = localAPI('GetClientsDomains', array('clientid' => $params['userid']));
         $resolver = new \Net_DNS2_Resolver(array('nameservers' => $nameserver));
         try {

core/Http/Response.php

@@ -11,7 +11,6 @@ use ThurData\Servers\KerioEmail\Core\Helper\BuildUrl;
 use ThurData\Servers\KerioEmail\Core\App\Controllers\Instances\Addon\Config;
 use ThurData\Servers\KerioEmail\Core\Helper\WhmcsVersionComparator;
 use ThurData\Servers\KerioEmail\Core\Helper\DnsHelper;
-use ThurData\Servers\KerioEmail\Core\Models\Whmcs\Server;
 /**
  * Description of Response
  *
@@ -22,7 +21,6 @@ class Response extends SymfonyRespose
     use \ThurData\Servers\KerioEmail\Core\Traits\Template;
     use \ThurData\Servers\KerioEmail\Core\Traits\IsAdmin;
     use \ThurData\Servers\KerioEmail\Core\UI\Traits\RequestObjectHandler;
-    use \ThurData\Servers\KerioEmail\Core\UI\Traits\WhmcsParams;
 
     protected $data = [];
     protected $lang;
@@ -168,9 +166,6 @@ class Response extends SymfonyRespose
         $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->nameserver2ip));
-        $params = $this->getWhmcsParamsByKeys(['domain', 'userid', 'serverhostname', 'domainid', 'configoption1']);
         $vars = [
             'assetsURL'                => BuildUrl::getAssetsURL(),
             'customAssetsURL'          => BuildUrl::getAssetsURL(true),