delete

siteBuilder.php

@@ -521,17 +521,24 @@ function siteBuilder_addSite($params) {
 		$site = $_POST['d'] . '.' . $params['domain'];
 	}
 	$siteBuilder = new ApiClient(getSiteBuilderApiURL($params), $params['serveraccesshash']);
+	// init dev
+	$response = $siteBuilder->init($params['username'], 'dev.' . $site, $params['serverusername'], $params['serverpassword']);
+	if($response['status'] != '200') {
+		return 'Error: ' . $response['response'];
+	}
+	// init prod
 	$response = $siteBuilder->init($params['username'], $site, $params['serverusername'], $params['serverpassword']);
 	if($response['status'] != '200') {
 		return 'Error: ' . $response['response'];
 	}
+	// update DB
 	try {
 		Capsule::table('sitePro_site')
 		->insert(
-				array(
+			array(
 				'relid'		=> $params['serviceid'],
 				'name'		=> $site,
-				'enabled'	=> false,
+				'enabled'	=> true,
 				)
 		);
 	} catch (\Exception $e) {
@@ -640,9 +647,37 @@ function siteBuilder_delSiteConfirm($params) {
  * @return string "success" or an error message
  */
 function siteBuilder_delSite($params) {
-	if(!filter_var($_POST['d'], FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)){
+	if(!filter_var($_POST['s'], FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)){
 		return 'Error: invalid domain name';
 	}
+	$site = $_POST['s'] . '.' . $params['domain'];
+	$siteBuilder = new ApiClient(getSiteBuilderApiURL($params), $params['serveraccesshash']);
+	// undeploy dev
+//	$response = $siteBuilder->undeploy($params['username'], 'dev.' . $site, $params['serverusername'], $params['serverpassword']);
+//	if($response['status'] != '200') {
+//		return 'Error: ' . $response['response'];
+//	}
+	// undeploy pord
+	$response = $siteBuilder->undeploy($params['username'], $site, $params['serverusername'], $params['serverpassword']);
+	if($response['status'] != '200') {
+		return 'Error: ' . $response['response'];
+	}
+	// update DB
+	try {
+		Capsule::table('sitePro_site')
+		->where('name', $site)
+		->delete();
+	} catch (\Exception $e) {
+		logModuleCall(
+			'siteBuilder',
+			__FUNCTION__,
+			$params,
+			'Error: could remove site from database',
+			$e->getMessage()
+			);
+		return 'Error: could remove site from database';
+	}
+
 	return 'success';
 }