firmware: after requested new sorting, plugins went in twice

PR: https://forum.opnsense.org/index.php?topic=6722.0
opnsense · Dec 31, 2017 · 080219e · 080219e
1 parent 99ac5f6
commit 080219e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
@@ -684,9 +684,7 @@ public function infoAction()
                     if ($plugin[0] == 'os') {
                         if ($type == 'local' || ($type == 'remote' &&
                             ($devel || end($plugin) != 'devel'))) {
-                            /* flip install status and prepend to search key to list them first */
-                            $sortkey = ($translated['installed'] ? '0' : '1') . $translated['name'];
-                            $plugins[$sortkey] = $translated;
+                            $plugins[$translated['name']] = $translated;
                         }
                     }
                 }
@@ -702,8 +700,11 @@ public function infoAction()
             $response['package'][] = $package;
         }
 
-        uksort($plugins, function ($a, $b) {
-            return strnatcasecmp($a, $b);
+        uasort($plugins, function ($a, $b) {
+            return strnatcasecmp(
+                ($a['installed'] ? '0' : '1') . $a['name'],
+                ($b['installed'] ? '0' : '1') . $b['name']
+            );
         });
 
         $response['plugin'] = array();