updates using login/usernames instead of ids for termination

Author: detain

bin/get_client.php

@@ -15,7 +15,9 @@ function_requirements('get_webhosting_plesk_instance');
 $plesk = get_webhosting_plesk_instance((isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : false));
 
 try {
-	$result = $plesk->getClient();
+	$result = $plesk->getClient([
+		'username' => $_SERVER['argv'][2],
+	]);
 } catch (ApiRequestException $e) {
 	echo 'Exception Error: '.$e->getMessage();
 	print_r($e);

src/Plesk.php

@@ -54,16 +54,12 @@ public function curlInit($host, $login, $password)
 		curl_setopt($this->curl, CURLOPT_POST, true);
 		curl_setopt($this->curl, CURLOPT_SSL_VERIFYPEER, false);
 		curl_setopt($this->curl, CURLOPT_SSL_VERIFYHOST, false);
-		curl_setopt(
-			$this->curl,
-			CURLOPT_HTTPHEADER,
-			[
+		curl_setopt($this->curl, CURLOPT_HTTPHEADER, [
 			"HTTP_AUTH_LOGIN: {$login}",
 			"HTTP_AUTH_PASSWD: {$password}",
 			'HTTP_PRETTY_PRINT: TRUE',
-			'Content-Type: text/xml; charset=UTF-8'
-		]
-		);
+		    'Content-Type: text/xml; charset=UTF-8'
+		]);
 		return $this->curl;
 	}
 

src/Plugin.php

@@ -358,15 +358,15 @@ function_requirements('get_webhosting_plesk_instance');
 			}
 			myadmin_log(self::$module, 'info', 'deleteSite Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());
 			*/
-			$request = ['id' => $subscriptoinId];
+			$request = ['owner-login' => $serviceClass->getUsername()];
 			try {
 				$result = $plesk->deleteSubscription($request);
 				myadmin_log(self::$module, 'info', 'deleteSubscription Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());
 			} catch (\Exception $e) {
 				myadmin_log('plesk', 'error', 'deleteSubscription id:'.$subscriptoinId.' Caught exception: '.$e->getMessage(), __LINE__, __FILE__, self::$module, $serviceClass->getId());
 				echo 'Caught exception: '.$e->getMessage().PHP_EOL;
 			}
-			$request = ['id' => $userId];
+			$request = ['login' => $serviceClass->getUsername()];
 			try {
 				$result = $plesk->deleteClient($request);
 				myadmin_log(self::$module, 'info', 'deleteClient Called got '.json_encode($result), __LINE__, __FILE__, self::$module, $serviceClass->getId());