Update Client.php

This resolved an issue where WHMCS hangs on 'Attempting to connect' when adding a server. This was fixed by adding in $this->params = new \stdClass;

Author: zeniar-au

modules/servers/AMP/lib/Client.php

@@ -9,18 +9,19 @@ class Client
 	private $params;
 	public $version;
 	public function __construct(array $params)
-    { 
+    {
 		$this->version = '2.0.6.0';
-        $endpoint = (!empty($params['serverhostname']) ? $params['serverhostname'] : $params['serverip']);
-        $this->params->serverId = $params['serverid'];
+		$this->params = new \stdClass;
+    $endpoint = (!empty($params['serverhostname']) ? $params['serverhostname'] : $params['serverip']);
+    $this->params->serverId = $params['serverid'];
 		$this->params->endpoint = ( !empty($params['serversecure']) ? 'https' : 'http').'://'.$endpoint.( !empty($params['serverport'] && $params['serversecure'] != true) ? ':'.$params['serverport'] : '');
 		$this->params->username = $params['serverusername'];
 		$this->params->password = $params['serverpassword'];
 
         if(!empty($params['serverid']))
         {
             $session = Capsule::table('ampSessions')->where('serverId', $params['serverid'])->value('sessionId');
-		}		
+		}
 		$this->params->sessionId = !empty($session) ? $session : $this->getSessionId();
 	}
 
@@ -35,7 +36,7 @@ private function getSessionId()
 		curl_setopt($ch, CURLOPT_URL, $this->params->endpoint . '/API/Core/Login');
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		
+
 		$data = [
 			'username' => $this->params->username,
 			'password' => $this->params->password,
@@ -55,7 +56,7 @@ private function getSessionId()
 
         $response = curl_exec($ch);
 		$decoded = json_decode($response, 1);
-		
+
         if(empty($decoded))
 		{
 			throw new \Exception('Unknown response');
@@ -66,19 +67,19 @@ private function getSessionId()
 			throw new \Exception($decoded['Message']);
         }
 
-		
+
 		if(!empty($decoded['result']['Reason']) && !$decoded['result']['Status'])
 		{
 			throw new \Exception($decoded['result']['Reason']);
 		}
 
         curl_close($ch);
-        
+
         if(!empty($this->params->serverId) && !empty($decoded['sessionID']))
         {
             Capsule::table('ampSessions')->updateOrInsert(['serverId' => $this->params->serverId], ['sessionId' => $decoded['sessionID']]);
         }
-		
+
 		return $decoded['sessionID'];
 	}
 
@@ -90,7 +91,7 @@ public function call(string $query, array $data = [])
 		curl_setopt($ch, CURLOPT_URL, $this->params->endpoint . '/API/'. $query);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		
+
 		if (!empty($data)) {
 			$post = json_encode($data);
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
@@ -107,7 +108,7 @@ public function call(string $query, array $data = [])
 		logModuleCall("AMP", $query, $post, $response);
 		$response = curl_exec($ch);
 		$decoded = json_decode($response, 1);
-		
+
 		if($decoded['Title'] == 'Unauthorized Access' || $decoded['result']['Status'] == false)
 		{
 			$data['SESSIONID'] = $this->getSessionId();
@@ -116,7 +117,7 @@ public function call(string $query, array $data = [])
 			$headers[3] = 'Content-length:'.strlen($post);
 			curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
 			$response = curl_exec($ch);
-			$decoded = json_decode($response, 1);	
+			$decoded = json_decode($response, 1);
 		}
 		curl_close($ch);
 
@@ -134,7 +135,7 @@ public function call(string $query, array $data = [])
 		{
 			throw new \Exception($decoded['result']['Reason']);
 		}
-		
+
 		return $decoded;
 	}
-}
+}