|
|
@@ -196,24 +196,13 @@ function cwp7_ClientArea($params){
|
|
|
$clientInfo['mgmtDomain'] = $domain['domain'];
|
|
|
$clientInfo['mgmtEmail'] = $domain['email'];
|
|
|
} else {
|
|
|
-
|
|
|
- if(opcache_is_script_cached("/Services/Internet/html/modules/servers/cwp7/cwp7.php")) {
|
|
|
- logModuleCall(
|
|
|
- 'cwp7',
|
|
|
- __FUNCTION__,
|
|
|
- '',
|
|
|
- 'debug',
|
|
|
- 'cached'
|
|
|
- );
|
|
|
- }
|
|
|
-
|
|
|
- if(array_key_exists($domain['domain'], $sslSites)) {
|
|
|
+ if(array_key_exists($domain['domain'], $sslSites)) {
|
|
|
$domain['ssl'] = 1;
|
|
|
$domain['sslexpire'] = $sslSites[$domain['domain']]['expire'];
|
|
|
$domain['autossl'] = $sslSites[$domain['domain']]['auotssl'];
|
|
|
- if(cwp7CheckDNS($domain['domain']) == 1) {
|
|
|
- $domain['DNS'] = 1;
|
|
|
- }
|
|
|
+ }
|
|
|
+ if(cwp7CheckDNS($domain['domain']) == 1) {
|
|
|
+ $domain['DNS'] = 1;
|
|
|
}
|
|
|
$domain['subdomains'] = array();
|
|
|
foreach($subDomains as $subDomain) {
|
|
|
@@ -223,16 +212,17 @@ function cwp7_ClientArea($params){
|
|
|
$subDomain['ssl'] = 1;
|
|
|
$subDomain['sslexpire'] = $sslSites[$subFQDN]['expire'];
|
|
|
$subDomain['autossl'] = $sslSites[$subFQDN]['auotssl'];
|
|
|
- if(cwp7CheckDNS($domain['domain']) == 1) {
|
|
|
- $subDomain['DNS'] = 1;
|
|
|
- }
|
|
|
} else {
|
|
|
unset($subDomain['ssl']);
|
|
|
unset($subDomain['sslexpire']);
|
|
|
unset($subDomain['autossl']);
|
|
|
+ }
|
|
|
+ if(cwp7CheckDNS($domain['domain']) == 1) {
|
|
|
+ $subDomain['DNS'] = 1;
|
|
|
+ } else {
|
|
|
unset($subDomain['DNS']);
|
|
|
}
|
|
|
- array_push($domain['subdomains'], $subDomain);
|
|
|
+ array_push($domain['subdomains'], $subDomain);
|
|
|
}
|
|
|
}
|
|
|
array_push($clientInfo['domains'], $domain);
|
|
|
@@ -334,13 +324,6 @@ function cwp7_UsageUpdate($params) {
|
|
|
|
|
|
function cwp7CheckDNS($domain) {
|
|
|
$nameserver = array( NS1, NS2);
|
|
|
- logModuleCall(
|
|
|
- 'cwp7',
|
|
|
- __FUNCTION__,
|
|
|
- $domain,
|
|
|
- 'debug',
|
|
|
- $nameserver
|
|
|
- );
|
|
|
$resolver = new Net_DNS2_Resolver(array('nameservers' => $nameserver));
|
|
|
try {
|
|
|
$result = $resolver->query($domain, 'A');
|