lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: be more chill about missing product_check and always return product info #5394

Browse Source
This commit is contained in:
Franco Fichtner 2021-12-09 09:47:24 +01:00
parent 7a68bab085
commit 602d5c5912
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
View File

@ -100,9 +100,21 @@ class FirmwareController extends ApiControllerBase
$backend->configdRun('firmware probe');
}
$response = json_decode(trim($backend->configdRun('firmware product')), true);
if ($response != null && $response['product_check'] != null) {
$response = $response['product_check'];
$product = json_decode(trim($backend->configdRun('firmware product')), true);
if ($product == null) {
$response = [
'status_msg' => gettext('Firmware status check was aborted internally. Please try again.'),
'status' => 'error',
];
} elseif ($product['product_check'] == null) {
$response = [
'product' => $product,
'status_msg' => gettext('Firmware status requires to check for update first to provide more information.'),
'status' => 'none',
];
} else {
$response = $product['product_check'];
$response['product'] = $product;
$download_size = !empty($response['download_size']) ? $response['download_size'] : 0;
@ -308,11 +320,6 @@ class FirmwareController extends ApiControllerBase
$response['status_msg'] = gettext('Unknown firmware status encountered.');
$response['status'] = 'error';
}
} else {
$response = array(
'status_msg' => gettext('Firmware status check was aborted internally. Please try again.'),
'status' => 'error',
);
}
return $response;