upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-02-19 02:29:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid calling toArray() on Config object, and simplify separate_stats condition

Browse source
This commit is contained in:
Ben Smithurst 2025-11-07 19:32:49 +00:00
parent 4c62ca8a17
commit 47a065eed8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php
View file

@ -99,10 +99,10 @@ class ServiceController extends ApiMutableServiceControllerBase
* @return array
*/
private function getStats(string $type) {
$config = Config::getInstance()->toArray();
$config = Config::getInstance()->object();
$backend = new Backend();
if (isset($config['OPNsense']['vnstat']['general']['separate_stats']) && !$config['OPNsense']['vnstat']['general']['separate_stats']) {
if ($config->OPNsense->vnstat->general->separate_stats == 0) {
// Separate stats are not wanted, just get totals - that's the default in vnstat itself,
// no need to specify anything here.
$response = $backend->configdpRun("vnstat", [ $type ]);
@ -111,10 +111,10 @@ class ServiceController extends ApiMutableServiceControllerBase
// Loop over configured interfaces, concatenating the output of each.
$result = '';
foreach (explode(',', $config['OPNsense']['vnstat']['general']['interface']) as $interface) {
foreach (explode(',', $config->OPNsense->vnstat->general->interface) as $interface) {
// Map the OPNsense interface name to the kernel interface name that vnstat uses.
if (isset($config['interfaces'][$interface]['if'])) {
$result .= $backend->configdpRun("vnstat", [ $type, $config['interfaces'][$interface]['if'] ]);
if (isset($config->interfaces->{$interface}->if)) {
$result .= $backend->configdpRun("vnstat", [ $type, $config->interfaces->{$interface}->if ]);
}
}
return array("response" => $result);