Ver Fonte

terminateAccount

andre há 7 meses atrás
pai
commit
98f6194633
1 ficheiros alterados com 19 adições e 14 exclusões
  1. 19 14
      siteBuilder.php

+ 19 - 14
siteBuilder.php

@@ -180,21 +180,8 @@ function siteBuilder_TerminateAccount($params) {
 	if($active == true) {
 	if($active == true) {
 		return 'Error: Account is active, please suspend account first';
 		return 'Error: Account is active, please suspend account first';
 	}
 	}
-	try {
-		$sites = Capsule::table('sitePro_site')
-		->where('relid',$params['serviceid'])
-		->value('name');
-	} catch (\Exception $e) {
-		logModuleCall(
-			'siteBuilder',
-			__FUNCTION__,
-			$params,
-			'Error: could fetch sites from database',
-			$e->getMessage()
-			);
-		return 'Error: could fetch sites from database';
-	}
 	// undeploy all related sites
 	// undeploy all related sites
+	$sites = getSites($params['serviceid']);
 	$siteBuilder = new ApiClient(getSiteBuilderApiURL($params), $params['serveraccesshash']);
 	$siteBuilder = new ApiClient(getSiteBuilderApiURL($params), $params['serveraccesshash']);
 	if(!empty($sites)) {
 	if(!empty($sites)) {
 		foreach($sites as $site) {
 		foreach($sites as $site) {
@@ -671,6 +658,24 @@ function getSiteBuilderApiURL($params) {
 	return $httpPrefix . $params['serverhostname'] . $serverPort;
 	return $httpPrefix . $params['serverhostname'] . $serverPort;
 }
 }
 
 
+function getSites($serviceID) {
+	try {
+		$sites = Capsule::table('sitePro_site')
+		->where('relid',$serviceID)
+		->value('name');
+	} catch (\Exception $e) {
+		logModuleCall(
+			'siteBuilder',
+			__FUNCTION__,
+			$params,
+			'Error: could fetch sites from database',
+			$e->getMessage()
+			);
+		return 'Error: could fetch sites from database';
+	}
+	return $sites;
+}
+
 function siteBuilderCreateTables() {
 function siteBuilderCreateTables() {
 	// Create a new table.
 	// Create a new table.
 	if (!Capsule::schema()->hasTable('sitePro_acc')) {
 	if (!Capsule::schema()->hasTable('sitePro_acc')) {