cleanup & comment

clientarea.tpl

@@ -197,7 +197,7 @@
                                         </b>
                                       {/if}
                                       &nbsp;
-                                      {if $site.enabled == 1}
+                                      {if $site.enabled == 'YES'}
                                         <i class="fas fa-eye" style="color:green;" title="Seite aktiv"></i>
                                       {else}
                                         <i class="fas fa-eye-slash" style="color:red;" title="Seite deaktiviert"></i>

siteBuilder.php

@@ -408,17 +408,19 @@ function siteBuilder_ClientArea($params) {
     $accEnabled = Capsule::table('sitePro_acc')
         ->where('pid', $params['serviceid'])
         ->value('enabled');
-	$sitesObj =  Capsule::table('sitePro_site')
-		->where('relid', $params['serviceid'])
-		->get();
 	$clientInfo['account'] = ['enabled' => $accEnabled];
 	$clientInfo['sites'] = [];
-	foreach($sitesObj as $site){
-		$response = $siteBuilder->getSSLDays($params['username'], $site->name);
+	$sites = getSites($params['serviceid']);
+	foreach($sites as $site){
+		$response = $siteBuilder->getSSLDays($params['username'], $site);
 		if($response['status'] == '200') {
 			$sslSite = $response['response']['ssl_remaining'];
 		}
-		array_push($clientInfo['sites'],['name' => $site->name, 'sslSite' => $sslSite, 'enabled' => $site->enabled]);
+		$response = $siteBuilder->isenabled($params['username'], $site);
+		if($response['status'] == '200') {
+			$enabled = $response['isenabled'];
+		}
+		array_push($clientInfo['sites'],['name' => $site->name, 'sslSite' => $sslSite, 'enabled' => $enabled]);
 	}
 	$response = $siteBuilder->getQuota($params['username']);
 	if($response['status'] != '200') {
@@ -1091,47 +1093,24 @@ function getSiteBuilderApiURL($params) {
 }
 
 function getSites($serviceID) {
-	try {
-		$sites = Capsule::table('sitePro_site')
-		->where('relid',$serviceID)
-		->select('name');
-	} catch (\Exception $e) {
-		logModuleCall(
-			'siteBuilder',
-			__FUNCTION__,
-			$params,
-			'Error: could fetch sites from database',
-			$e->getMessage()
-			);
-		return 'Error: could fetch sites from database';
+	$sitesObj =  Capsule::table('sitePro_site')
+		->where('relid', $serviceID)
+		->get();
+	$sites = [];
+	foreach($sitesObj as $site){
+		array_push($sites, $site->name);
 	}
-
-	logModuleCall(
-		'siteBuilder',
-		__FUNCTION__,
-		$serviceID,
-		'Getsites',
-		$sites
-		);
-
 	return $sites;
 }
 
 function getSitesEnabled($serviceID) {
-	try {
-		$sites = Capsule::table('sitePro_site')
-		->where('relid',$serviceID)
+	$sitesObj =  Capsule::table('sitePro_site')
+		->where('relid', $serviceID)
 		->where('enabled', 1)
-		->value('name');
-	} catch (\Exception $e) {
-		logModuleCall(
-			'siteBuilder',
-			__FUNCTION__,
-			$params,
-			'Error: could fetch sites from database',
-			$e->getMessage()
-			);
-		return 'Error: could fetch sites from database';
+		->get();
+	$sites = [];
+	foreach($sitesObj as $site){
+		array_push($sites, $site->name);
 	}
 	return $sites;
 }