clientareafunctions

cwp7.php

@@ -168,13 +168,6 @@ function cwp7_UnsuspendAccount($params) {
 }
 
 function cwp7_ClientArea($params){
-	logModuleCall(
-		'cwp7',
-		__FUNCTION__,
-		$params,
-		'debug',
-		''
-	);
 	$clientInfo = array('moduleclientarea' => '1');
 	$cwp7 = new cwp7_Admin($params['serverhostname'], $params['serveraccesshash']);
 	$response = $cwp7->getAutoSSL($params['username']);
@@ -210,10 +203,10 @@ function cwp7_ClientArea($params){
 				$domain['sslexpire'] = $sslSites[$domain['domain']]['expire'];
 				$domain['autossl'] = $sslSites[$domain['domain']]['auotssl'];
 			}
-			if(cwp7CheckA($domain['domain'],$params['serverip']) == 1) {
+			if(cwp7CheckA($domain['domain'],$params['serverip'],$params['configoption5']) == 1) {
 				$domain['DNS'] = 1;
 			}
-			$domain['domainNS'] = cwp7CheckSOA($domain['domain']);
+			$domain['domainNS'] = cwp7CheckSOA($domain['domain'],$params['configoption5'],$params['configoption6']);
 			$domain['subdomains'] = array();
 			foreach($subDomains as $subDomain) {
 				if($subDomain['domain'] == $domain['domain']) {
@@ -227,7 +220,7 @@ function cwp7_ClientArea($params){
 						unset($subDomain['sslexpire']);
 						unset($subDomain['autossl']);
 					}
-					if(cwp7CheckA($subFQDN,$params['serverip']) == 1) {
+					if(cwp7CheckA($subFQDN,$params['serverip'],$params['configoption5']) == 1) {
 						$subDomain['DNS'] = 1;
 					} else {
 						unset($subDomain['DNS']);
@@ -618,7 +611,7 @@ function cwp7_infoDNS($params) {
 	if(!filter_var($_POST['d'], FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)){
 		return 'Error: invalid domain name';
 	}
-	$cwp7nameserver = cwp7CheckSOA($_POST['d']);
+	$cwp7nameserver = cwp7CheckSOA($_POST['d'],$params['configoption5'],$params['configoption6']);
 	return array(
         'templatefile' => 'cwp7_help_dns',
         'vars' => array(
@@ -628,11 +621,11 @@ function cwp7_infoDNS($params) {
     );
 }
 
-function cwp7CheckA($domain, $serverIP, $recurse = 0) {
+function cwp7CheckA($domain, $serverIP, $nameserverIP, $recurse = 0) {
 	if($recurse > 3) {
 		return false;
 	}
-	$nameserver = array(NS1);
+	$nameserver = array($nameserverIP);
 	$resolver = new Net_DNS2_Resolver(array('nameservers' => $nameserver));
     try {
             $result = $resolver->query($domain, 'A');
@@ -648,7 +641,7 @@ function cwp7CheckA($domain, $serverIP, $recurse = 0) {
 	}
 	$domainA = $result->answer;
 	if($domainA[0]->type == 'CNAME') {
-		if(cwp7CheckA($domainA[0]->cname, $serverIP, $recurse++)) {
+		if(cwp7CheckA($domainA[0]->cname, $serverIP, $nameserverIP, $recurse++)) {
 			return true;
 		}
 	}
@@ -659,8 +652,8 @@ function cwp7CheckA($domain, $serverIP, $recurse = 0) {
 	}
 }
 
-function cwp7CheckSOA($domain) {
-	$nameserver = array(NS1);
+function cwp7CheckSOA($domain, $nameserverIP, $nameserverName ) {
+	$nameserver = array($nameserverIP);
 	$resolver = new Net_DNS2_Resolver(array('nameservers' => $nameserver));
     try {
             $result = $resolver->query($domain, 'SOA');
@@ -676,7 +669,7 @@ function cwp7CheckSOA($domain) {
 		return 'none';
 	}
 
-	if($result->answer[0]->mname == NSTHURDATA) {
+	if($result->answer[0]->mname == $nameserverName) {
 		return 'self';
 	}
 	return $result->answer[0]->mname;