소스 검색

new dns helper class

andre 6 달 전
부모
커밋
d535cb1924
2개의 변경된 파일12개의 추가작업 그리고 4개의 파일을 삭제
  1. 11 3
      core/Helper/DnsHelper.php
  2. 1 1
      core/Http/Response.php

+ 11 - 3
core/Helper/DnsHelper.php

@@ -14,7 +14,6 @@ class DnsHelper
 {
 {
     const NS1 = '185.163.51.130';
     const NS1 = '185.163.51.130';
     const NS2 = '185.163.51.131';
     const NS2 = '185.163.51.131';
-    const MX  = 'mail3.seecure.ch';
     const SPF = 'v=spf1 mx a:mail3.seecure.ch ip4:185.163.51.0/24 ip4:89.35.78.0/23 ~all';
     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';
     const DMARC = 'v=DMARC1; p=reject; rua=mailto:technik@thurdata.ch; ruf=mailto:technik@thurdata.ch';
     public static function KerioEmailCheckDNS($params)
     public static function KerioEmailCheckDNS($params)
@@ -126,17 +125,26 @@ class DnsHelper
         }
         }
         if(empty($domainMX)){
         if(empty($domainMX)){
             $vars['mx'] = 'unset';
             $vars['mx'] = 'unset';
-            $vars['mxtarget'] = MX;
+            $vars['mxtarget'] = $params['serverhostname'];
         } else {
         } else {
             $vars['domainMX'] = $domainMX;
             $vars['domainMX'] = $domainMX;
             $domainMXrecord = array_shift($domainMX);
             $domainMXrecord = array_shift($domainMX);
             $vars['mxtarget'] = $domainMXrecord->exchange;
             $vars['mxtarget'] = $domainMXrecord->exchange;
-            if($domainMXrecord->exchange == MX) {
+            if($domainMXrecord->exchange == $params['serverhostname']) {
                 $vars['mx'] = 'set';
                 $vars['mx'] = 'set';
             } else {
             } else {
                 $var['mx'] = 'wrong';
                 $var['mx'] = 'wrong';
             }
             }
         }
         }
+
+        logModuleCall(
+    		'kerioEmail',
+	    	__FUNCTION__,
+		    $params,
+    		'Debug',
+	    	$vars
+    	);
+
         return $vars;
         return $vars;
     }
     }
 }
 }

+ 1 - 1
core/Http/Response.php

@@ -168,7 +168,7 @@ class Response extends SymfonyRespose
         $menu = $mainMenu->getMenu();
         $menu = $mainMenu->getMenu();
 
 
         $addon = ServiceLocator::call(Config::class);
         $addon = ServiceLocator::call(Config::class);
-        $params = $this->getWhmcsParamsByKeys(['domain', 'userid', 'serverhostname']);
+        $params = $this->getWhmcsParamsByKeys(['domain', 'userid', 'serverhostname', 'serverdata']);
 
 
         $vars = [
         $vars = [
             'assetsURL'                => BuildUrl::getAssetsURL(),
             'assetsURL'                => BuildUrl::getAssetsURL(),