create & terminate

api/sitebuilder.php

@@ -77,7 +77,6 @@ class ApiClient {
         ];
         return $this->sendRequest('POST', $url, $data);
     }
-  
      
     /**
      * Disables the prod webpage
@@ -88,11 +87,25 @@ class ApiClient {
      * @return                  a json with ['status' => $httpCode,'response' => ['success' => 'Text']];
      *                          or a json with ['status' => $httpCode,'response' => ['error' => 'Error-Description']];
      */
-    public function disableprod($domain,$userName) {
+    public function disableprod($domain,$username) {
         $url = "$this->apiUrl/disableprod/$username/$domain";
         return $this->sendRequest('GET', $url);
     }
   
+    /**
+     * Deletes the prod & dev webpages
+     *
+     * @param username:        The username under which the domain is deployed
+     * @param domain:          The Domain to migrate
+     *
+     * @return                  a json with ['status' => $httpCode,'response' => ['success' => 'Text']];
+     *                          or a json with ['status' => $httpCode,'response' => ['error' => 'Error-Description']];
+     */
+    public function terminate($domain,$username) {
+        $url = "$this->apiUrl/terminate/$username/$domain";
+        return $this->sendRequest('GET', $url);
+    }
+  
     /**
      * Enables the prod webpage
      *
@@ -102,7 +115,7 @@ class ApiClient {
      * @return                  a json with ['status' => $httpCode,'response' => ['isenabled' => 'YES']];
      *                          or a json with ['status' => $httpCode,'response' => ['isenabled' => 'NO']];
      */
-    public function enableprod($domain,$userName) {
+    public function enableprod($domain,$username) {
         $url = "$this->apiUrl/enableprod/$username/$domain";
         return $this->sendRequest('GET', $url);
     }
@@ -117,7 +130,7 @@ class ApiClient {
      * @return                  a json with ['status' => $httpCode,'response' => ['success' => 'Text']];
      *                          or a json with ['status' => $httpCode,'response' => ['error' => 'Error-Description']];
      */
-    public function isprodenabled($domain,$userName) {
+    public function isprodenabled($domain,$username) {
         $url = "$this->apiUrl/isprodenabled/$username/$domain";
         return $this->sendRequest('GET', $url);
     }
@@ -130,7 +143,7 @@ class ApiClient {
      *
      * @return                  a json with ['status' => $httpCode,'response' => ['ssl_expiry' => 'Datum des Ablaufs des Zertifikats', 'ssl_remaining' => 'Anzahl der Tage bis zum Ablauf des Zertifikats']];
      */
-    public function getSSLDays($domain,$userName) {
+    public function getSSLDays($domain,$username) {
         $url = "$this->apiUrl/getssldays/$username/$domain";
         return $this->sendRequest('GET', $url);
     }
@@ -152,7 +165,7 @@ class ApiClient {
      *                                      ];
      *                                         
      */
-    public function listbackups($domain,$userName) {
+    public function listbackups($domain,$username) {
         $url = "$this->apiUrl/listbackups/$username/$domain";
         return $this->sendRequest('GET', $url);
     }
@@ -169,7 +182,7 @@ class ApiClient {
      * @return                  a json with ['status' => $httpCode,'response' => ['success' => 'Text']];
      *                          or a json with ['status' => $httpCode,'response' => ['error' => 'Error-Description']];
      */
-    public function restorebackup($domain,$userName,$backupDate) {
+    public function restorebackup($domain,$username,$backupDate) {
         $url = "$this->apiUrl/restorebackup/$username/$domain";
         $data = [
             'backup_date' => $backupDate

siteBuilder.php

@@ -56,15 +56,6 @@ function siteBuilder_MetaData() {
 function siteBuilder_Testconnection($params) {
 	$siteBuilder = new ApiClient(getSiteBuilderApiURL($params), $params['serveraccesshash']);
 	$response = $siteBuilder->ping($params['serverusername'], $params['serverpassword']);
-
-	logModuleCall(
-		'siteBuilder',
-		__FUNCTION__,
-		getSiteBuilderApiURL($params),
-		'debug',
-		$response
-		);
-
 	if($response['response']['answer'] == 'pong') {
 		return array(
 			'success' => true,
@@ -116,7 +107,7 @@ function siteBuilder_CreateAccount($params) {
 		return 'Error: could save username & password in database';
 	}	
 	if ($params["server"] == 1) {
-		$siteBuilder = new ApiClient($params['serverhostname'], $params['serveraccesshash']);
+		$siteBuilder = new ApiClient(getSiteBuilderApiURL($params), $params['serveraccesshash']);
 		$response = $siteBuilder->deployDev($username, $domain, $params['serverusername'], $params['serverpassword']);
 	}
 	if($response['status'] != '200') {
@@ -138,8 +129,8 @@ function siteBuilder_CreateAccount($params) {
  * @return string 'success' or an error message
  */
 function siteBuilder_TerminateAccount($params) {
-	$siteBuilder = new ApiClient($params['serverhostname'], $params['serveraccesshash']);
-	$response = $siteBuilder->deleteAccount($params['username'], $params['serverusername'], $params['serverpassword']);
+	$siteBuilder = new ApiClient(getSiteBuilderApiURL($params), $params['serveraccesshash']);
+	$response = $siteBuilder->terminateAccount($params['username'], $params['serverusername'], $params['serverpassword']);
 	if($response['status'] != '200') {
 		return 'Error: ' . $response['response'];
 	}