Просмотр исходного кода

new check_configure_kerio_buisness_mail.tpl

andre 6 месяцев назад
Родитель
Сommit
1553371f55
2 измененных файлов с 5 добавлено и 3 удалено
  1. 2 2
      core/Helper/DnsHelper.php
  2. 3 1
      core/Http/Response.php

+ 2 - 2
core/Helper/DnsHelper.php

@@ -16,13 +16,13 @@ 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()
+    public function KerioEmailCheckDNS()
     {
         unset($zoneID);
         unset($mxStatus);
         unset($dnsData);
         unset($vars);
-        $params = \ThurData\Servers\KerioEmail\Core\UI\Traits\WhmcsParams::getWhmcsParamsByKeys(['domain', 'userid', 'serverhostname', 'domainid', 'serverid']);
+        $params = $this->getWhmcsParamsByKeys(['domain', 'userid', 'serverhostname', 'domainid', 'serverid']);
         $vars['maildomain'] = $params['domain'];
         $server = Server::select('id', 'nameserver1ip', 'nameserver2ip')->findOrFail($params['serverid']);
         $nameserver = array(trim($server->nameserver1ip), trim($server->nameserver2ip));

+ 3 - 1
core/Http/Response.php

@@ -165,6 +165,8 @@ class Response extends SymfonyRespose
         $mainMenu = DependencyInjection::create(MainMenu::class)->buildBreadcrumb($controller,  $action, []);
         $menu = $mainMenu->getMenu();
 
+        $dnshelper = new DnsHelper;
+
         $addon = ServiceLocator::call(Config::class);
         $vars = [
             'assetsURL'                => BuildUrl::getAssetsURL(),
@@ -185,7 +187,7 @@ class Response extends SymfonyRespose
             'tagImageModule'           => $addon->getConfigValue('moduleIcon'),
             'isDebug'                  => (bool)((int)$addon->getConfigValue('debug', "0")),
             'errorPageDetails'         => $this->getErrorPageData($responseResolver),
-            'dnsvars'                  => DnsHelper::KerioEmailCheckDNS()
+            'dnsvars'                  => $dnshelper->KerioEmailCheckDNS()
         ];
         try
         {