andre 3 лет назад
Родитель
Сommit
bdfaa3ecb2
2 измененных файлов с 13 добавлено и 12 удалено
  1. 5 1
      clientarea.tpl
  2. 8 11
      cwp7.php

+ 5 - 1
clientarea.tpl

@@ -215,7 +215,11 @@
                               </td>
                               <td style="text-align:center;padding:5px;">
                                 {if $domain.DNS != 1}
-                                  <i class="fas fa-power-off fa-fw"></i>
+                                  {if $domain.domainNS == 'self'}
+                                    <i class="fas fa-power-off fa-fw"></i>
+                                  {else}
+                                    <i class="fas fa-info fa-fw"></i>
+                                  {/if}
                                 {/if}
                               </td>
                               <td style="text-align:center;padding:5px;{if $domain.ssl == 1}color:green;{else}color:red;{/if}">

+ 8 - 11
cwp7.php

@@ -201,7 +201,7 @@ function cwp7_ClientArea($params){
 			if(cwp7CheckA($domain['domain'],$params['serverip']) == 1) {
 				$domain['DNS'] = 1;
 			}
-			cwp7CheckNS($domain['domain']);
+			$clientInfo['domainNS'] = cwp7CheckSOA($domain['domain']);
 			$domain['subdomains'] = array();
 			foreach($subDomains as $subDomain) {
 				if($subDomain['domain'] == $domain['domain']) {
@@ -366,7 +366,7 @@ function cwp7CheckA($domain, $serverIP, $recurse = 0) {
 	}
 }
 
-function cwp7CheckNS($domain) {
+function cwp7CheckSOA($domain) {
 	$nameserver = array('10.200.22.100');
 	$resolver = new Net_DNS2_Resolver(array('nameservers' => $nameserver));
     try {
@@ -380,14 +380,11 @@ function cwp7CheckNS($domain) {
 			'DNS lookup exception',
 			$e->getMessage()
 		);
+		return 'unregistered';
 	}
-	$domainNS = $result->answer;
-	logModuleCall(
-		'cwp7',
-		__FUNCTION__,
-		$result,
-		'debug',
-		$domainNS
-	);
-	return true;
+	$domainSOA = $result->answer;
+	if($domainSOA[0]->mname == 'ns1.thurdata.ch') {
+		return 'self';
+	}
+	return 'other';
 }