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:
@@ -26,17 +26,17 @@ switch ($vf->validateAction(true)) {
|
||||
$whmcsService = Database::getWhmcsService((int)$_GET['serviceID']);
|
||||
|
||||
if (!$whmcsService) {
|
||||
$vf->output(['success' => false, 'errors' => 'Service not found.'], true, true, 200);
|
||||
$vf->output(['success' => false, 'errors' => 'Service not found.'], true, true, 404);
|
||||
}
|
||||
|
||||
if ($whmcsService->domainstatus == 'Pending' || $whmcsService->domainstatus == 'Terminated' || $whmcsService->domainstatus == 'Cancelled' || $whmcsService->domainstatus == 'Fraud') {
|
||||
$vf->output(['success' => false, 'errors' => 'Server is not Active, Suspended or Completed. Not fetching remote data.'], true, true, 200);
|
||||
$vf->output(['success' => false, 'errors' => 'Server is not Active, Suspended or Completed. Not fetching remote data.'], true, true, 400);
|
||||
}
|
||||
|
||||
$data = $vf->fetchServerData((int)$_GET['serviceID']);
|
||||
|
||||
if (!$data) {
|
||||
$vf->output(['success' => false, 'errors' => 'No data returned from VirtFusion.'], true, true, 200);
|
||||
$vf->output(['success' => false, 'errors' => 'No data returned from VirtFusion.'], true, true, 502);
|
||||
|
||||
}
|
||||
|
||||
@@ -58,12 +58,21 @@ switch ($vf->validateAction(true)) {
|
||||
$service = Database::getSystemService((int)$_GET['serviceID']);
|
||||
|
||||
if (!$service) {
|
||||
$vf->output(['success' => false, 'errors' => 'Service not found'], true, true, 200);
|
||||
$vf->output(['success' => false, 'errors' => 'Service not found'], true, true, 404);
|
||||
}
|
||||
|
||||
$whmcsService = Database::getWhmcsService((int)$_GET['serviceID']);
|
||||
|
||||
if (!$whmcsService) {
|
||||
$vf->output(['success' => false, 'errors' => 'WHMCS service not found'], true, true, 404);
|
||||
}
|
||||
|
||||
$cp = $vf->getCP($whmcsService->server);
|
||||
|
||||
if (!$cp) {
|
||||
$vf->output(['success' => false, 'errors' => 'Control server not found'], true, true, 500);
|
||||
}
|
||||
|
||||
$request = $vf->initCurl($cp['token']);
|
||||
|
||||
$data = $request->get($cp['url'] . '/users/' . $whmcsService->userid . '/byExtRelation');
|
||||
@@ -72,7 +81,7 @@ switch ($vf->validateAction(true)) {
|
||||
$vf->output(['success' => true, 'url' => $cp['base_url'], 'user' => json_decode($data, true)['data']], true, true, 200);
|
||||
}
|
||||
|
||||
$vf->output(['success' => false, 'errors' => 'Received HTTP code ' . $request->getRequestInfo('http_code')], true, true, 200);
|
||||
$vf->output(['success' => false, 'errors' => 'Received HTTP code ' . $request->getRequestInfo('http_code')], true, true, 502);
|
||||
|
||||
}
|
||||
break;
|
||||
@@ -80,6 +89,5 @@ switch ($vf->validateAction(true)) {
|
||||
default:
|
||||
/** No valid action was specified **/
|
||||
|
||||
$vf->output(['success' => false, 'errors' => 'invalid action'], true, true, 200);
|
||||
$vf->output(['success' => false, 'errors' => 'invalid action'], true, true, 400);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user