fix: add null/false guards, proper error handling, and VNC popup fix
- Add isset() guards before count() on ipv4/ipv6 arrays in ServerResource to prevent PHP 8.0+ TypeError - Add null checks after getWhmcsService() and getCP() in 18 Module methods and 5 ModuleFunctions methods to prevent fatal null dereference errors - Add null guards for $whmcsService and $cp in admin.php impersonateServerOwner - Fix HTTP status codes throughout admin.php (404, 400, 500, 502 instead of 200) - Guard ConfigureService methods against $this->cp === false - Use null coalescing for customfields access in initServerBuild - Check API response code in initServerBuild instead of always returning true - Replace exit() with RuntimeException in Curl.php - Change catch(Exception) to catch(Throwable) in hooks.php for PHP 8.0+ - Open VNC window before AJAX call to avoid popup blocker Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -183,7 +183,11 @@ class ModuleFunctions extends Module
|
||||
|
||||
if ($service) {
|
||||
$whmcsService = Database::getWhmcsService($params['serviceid']);
|
||||
if (!$whmcsService) return 'WHMCS service record not found.';
|
||||
|
||||
$cp = $this->getCP($whmcsService->server);
|
||||
if (!$cp) return 'No control server found.';
|
||||
|
||||
$request = $this->initCurl($cp['token']);
|
||||
$data = $request->put($cp['url'] . '/servers/' . (int) $service->server_id . '/package/' . (int) $params['configoption2']);
|
||||
$data = json_decode($data);
|
||||
@@ -224,8 +228,10 @@ class ModuleFunctions extends Module
|
||||
if ($service) {
|
||||
|
||||
$whmcsService = Database::getWhmcsService($params['serviceid']);
|
||||
if (!$whmcsService) return 'WHMCS service record not found.';
|
||||
|
||||
$cp = $this->getCP($whmcsService->server);
|
||||
if (!$cp) return 'No control server found.';
|
||||
|
||||
$request = $this->initCurl($cp['token']);
|
||||
$data = $request->delete($cp['url'] . '/servers/' . (int) $service->server_id);
|
||||
@@ -275,8 +281,11 @@ class ModuleFunctions extends Module
|
||||
if ($service) {
|
||||
|
||||
$whmcsService = Database::getWhmcsService($params['serviceid']);
|
||||
if (!$whmcsService) return 'WHMCS service record not found.';
|
||||
|
||||
$cp = $this->getCP($whmcsService->server);
|
||||
if (!$cp) return 'No control server found.';
|
||||
|
||||
$request = $this->initCurl($cp['token']);
|
||||
$data = $request->post($cp['url'] . '/servers/' . (int) $service->server_id . '/suspend');
|
||||
$data = json_decode($data);
|
||||
@@ -319,8 +328,11 @@ class ModuleFunctions extends Module
|
||||
if ($service) {
|
||||
|
||||
$whmcsService = Database::getWhmcsService($params['serviceid']);
|
||||
if (!$whmcsService) return 'WHMCS service record not found.';
|
||||
|
||||
$cp = $this->getCP($whmcsService->server);
|
||||
if (!$cp) return 'No control server found.';
|
||||
|
||||
$request = $this->initCurl($cp['token']);
|
||||
$data = $request->get($cp['url'] . '/servers/' . (int) $service->server_id);
|
||||
$data = json_decode($data);
|
||||
@@ -349,8 +361,11 @@ class ModuleFunctions extends Module
|
||||
|
||||
if ($service) {
|
||||
$whmcsService = Database::getWhmcsService($params['serviceid']);
|
||||
if (!$whmcsService) return 'WHMCS service record not found.';
|
||||
|
||||
$cp = $this->getCP($whmcsService->server);
|
||||
if (!$cp) return 'No control server found.';
|
||||
|
||||
$request = $this->initCurl($cp['token']);
|
||||
$data = $request->post($cp['url'] . '/servers/' . (int) $service->server_id . '/unsuspend');
|
||||
$data = json_decode($data);
|
||||
|
||||
Reference in New Issue
Block a user