lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: flip remote array to emulate local array layout

Browse Source
This commit is contained in:
Franco Fichtner 2015-07-13 09:29:13 +02:00
parent 0d36c8e77c
commit 24302ea00e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,19 +130,18 @@ class FirmwareController extends ApiControllerBase
{
$this->sessionClose(); // long running action, close session
$response = array('local' => array(), 'remote' => array());
$backend = new Backend();
$remote = $backend->configdRun('firmware remote');
$local = $backend->configdRun('firmware local');
/*
* pkg(8) returns malformed json by simply outputting each
* indivudual package json block... fix it up for now.
*/
$local = str_replace("\n}\n", "\n},\n", trim($local));
$local = json_decode('[' . $local . ']', true);
/* Remote packages are only a flat list */
$remote = explode("\n", trim($remote));
$response = array('local' => array(), 'remote' => $remote);
if ($local != null) {
$keep = array('name', 'version', 'comment', 'www', 'flatsize', 'licenses', 'desc', 'categories');
foreach ($local as $infos) {
@ -156,6 +155,13 @@ class FirmwareController extends ApiControllerBase
}
}
/* Remote packages are only a flat list */
$remote = explode("\n", trim($remote));
foreach ($remote as $name) {
/* keep layout compatible with the above */
$response['remote'][] = array('name' => $name);
}
return $response;
}
}