clientarea

cwp7.php

@@ -194,30 +194,21 @@ function cwp7_ClientArea($params){
 		} else {
 			if(array_key_exists($domain['domain'], $sslSites)) {
 				$domain['ssl'] = 1;
-				$domain['sslexpire'] = $sslSites[$domain['domain']]['exp'];
+				$domain['sslexpire'] = $sslSites[$domain['domain']]['expire'];
 				if($sslSites[$domain['domain']]['autossl'] == 'on') {
-					$domain['autossl'] = 1;
+					$domain['autossl'] = $sslSites[$domain['domain']]['auotssl'];
 				}
 			}
 			$domain['subdomains'] = array();
 			foreach($subDomains as $subDomain) {
 				if($subDomain['domain'] == $domain['domain']) {
-					array_push(
-						$domain['subdomains'], array(
-							'subdomain'	=> $subDomain['subdomain'],
-							'path'		=> $subDomain['path'],
-						)
-					);
 					if(array_key_exists($subDomain['domain'], $sslSites)) {
-						array_push(
-							$domain['subdomains'], array(
-								'ssl' 		=> 1,
-								'sslexpire' => $sslSites[$subDomain['domain']]['exp'],
-								'autossl'	=> $sslSites[$subDomain['domain']]['autossl'],
-							)
-						);
+						$domain['ssl'] = 1;
+						$domain['sslexpire'] = $sslSites[$subDomain['domain']]['expire'];
+						$domain['autossl']	= $sslSites[$subDomain['domain']]['auotssl'];
 					}
 				}
+				array_push($domain['subdomains'], $subDomain);
 			}
 			array_push($clientInfo['domains'], $domain);
 		}