diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php index 985bff04f..a3cac3fe8 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php @@ -857,8 +857,19 @@ class FirmwareController extends ApiMutableModelControllerBase $devel = count($devel) == 2 ? $devel[1] == 'devel' : false; /* need both remote and local, create array earlier */ - $packages = array(); - $plugins = array(); + $packages = []; + $plugins = []; + $tiers = []; + + $current = $backend->configdRun('firmware tiers'); + $current = explode("\n", trim($current ?? '')); + + foreach ($current as $line) { + $expanded = explode('|||', $line); + if (count($expanded) == 3) { + $tiers[$expanded[0]] = $expanded[2]; + } + } /* package infos are flat lists with 3 pipes as delimiter */ foreach (array('remote', 'local') as $type) { @@ -939,6 +950,7 @@ class FirmwareController extends ApiMutableModelControllerBase $response['plugin'] = array(); foreach ($plugins as $plugin) { + $plugin['tier'] = isset($tiers[$plugin['name']]) ? $tiers[$plugin['name']] : gettext('N/A'); $response['plugin'][] = $plugin; } diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt index 3e6da32cd..0c3c47fcf 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt @@ -1,5 +1,5 @@ {# - # Copyright (c) 2015-2022 Franco Fichtner + # Copyright (c) 2015-2023 Franco Fichtner # Copyright (c) 2015-2018 Deciso B.V. # All rights reserved. # @@ -443,6 +443,7 @@ '' + '' + bold_on + row['name'] + status_text + bold_off + '' + '' + bold_on + row['version'] + bold_off + '' + '' + bold_on + row['flatsize'] + bold_off + '' + + '' + bold_on + row['tier'] + bold_off + '' + '' + bold_on + row['repository'] + bold_off + '' + '' + bold_on + row['comment'] + bold_off + '' + '
' + @@ -931,6 +932,7 @@ {{ lang._('Version') }} {{ lang._('Size') }} + {{ lang._('Tier') }} {{ lang._('Repository') }} {{ lang._('Comment') }}