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

Lobby: Dashboard [new] - remove more spurious json_encode's cc @swhite2

Browse Source
This commit is contained in:
Ad Schellevis 2024-05-12 11:20:47 +02:00
parent 4bb594ba81
commit d86142927e
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/opnsense/mvc/app/controllers/OPNsense/Core/Api/SystemController.php
View File

@ -173,7 +173,7 @@ class SystemController extends ApiControllerBase
}
}
$response = json_encode($statuses);
$response = $statuses;
}
return $response;
@ -241,7 +241,7 @@ class SystemController extends ApiControllerBase
: gettext('Click to check for updates.'),
];
return json_encode($response);
return $response;
}
public function systemTimeAction()
@ -258,7 +258,7 @@ class SystemController extends ApiControllerBase
'config' => $last_change,
];
return json_encode($response);
return $response;
}
public function systemResourcesAction()
@ -293,7 +293,7 @@ class SystemController extends ApiControllerBase
$result['memory']['used'] = gettext('N/A');
}
return json_encode($result);
return $result;
}
public function systemDiskAction()
@ -320,6 +320,6 @@ class SystemController extends ApiControllerBase
}
}
return json_encode($result);
return $result;
}
}

14
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/CpuUsageController.php
View File

@ -41,14 +41,12 @@ class CpuUsageController extends ApiControllerBase
{
$sysctls = json_decode((new Backend())->configdRun('system sysctl values hw.model,kern.smp.cpus,kern.smp.cores'), true);
return json_encode(
sprintf(
gettext('%s (%s cores, %s threads)'),
$sysctls['hw.model'],
$sysctls['kern.smp.cpus'],
$sysctls['kern.smp.cores']
)
);
return [sprintf(
gettext('%s (%s cores, %s threads)'),
$sysctls['hw.model'],
$sysctls['kern.smp.cpus'],
$sysctls['kern.smp.cores']
)];
}
public function streamAction()