(menu, cleanup) move interface items to model, remove duplicate code

src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php

@@ -203,23 +203,6 @@ class ControllerBase extends ControllerRoot
 
         // set translator
         $this->view->setVar('lang', $this->getTranslator($cnf));
-
-        $ifarr = array();
-        foreach ($cnf->object()->interfaces->children() as $key => $node) {
-            $ifarr[$key] = !empty($node->descr) ? $node->descr->__toString() : strtoupper($key);
-        }
-        natcasesort($ifarr);
-        $ordid = 0;
-        foreach ($ifarr as $key => $descr) {
-            $menu->appendItem('Interfaces', $key, array(
-                'url' => '/interfaces.php?if='. $key,
-                'visiblename' => '[' . $descr . ']',
-                'cssclass' => 'fa fa-sitemap',
-                'order' => $ordid++,
-            ));
-        }
-        unset($ifarr);
-
         $this->view->menuSystem = $menu->getItems("/ui".$this->router->getRewriteUri());
 
         // set theme in ui_theme template var, let template handle its defaults (if there is no theme).

src/opnsense/mvc/app/controllers/OPNsense/Core/Api/MenuController.php

@@ -33,7 +33,6 @@ namespace OPNsense\Core\Api;
 use OPNsense\Base\ApiControllerBase;
 use OPNsense\Base\Menu;
 use OPNsense\Core\ACL;
-use OPNsense\Core\Config;
 
 /**
  * Class MenuController
@@ -125,25 +124,6 @@ class MenuController extends ApiControllerBase
             $this->username = $this->session->get("Username");
         }
 
-        // add interfaces to "Interfaces" menu tab... kind of a hack, may need some improvement.
-        $cnf = Config::getInstance();
-
-        $ifarr = array();
-        foreach ($cnf->object()->interfaces->children() as $key => $node) {
-            $ifarr[$key] = !empty($node->descr) ? $node->descr->__toString() : strtoupper($key);
-        }
-        natcasesort($ifarr);
-        $ordid = 0;
-        foreach ($ifarr as $key => $descr) {
-            $menu->appendItem('Interfaces', $key, array(
-                'url' => '/interfaces.php?if='. $key,
-                'visiblename' => '[' . $descr . ']',
-                'cssclass' => 'fa fa-sitemap',
-                'order' => $ordid++,
-            ));
-        }
-        unset($ifarr);
-
         // fetch menu items and apply acl
         $menu_items = $menu->getItems($selected_uri);
         $this->applyACL($menu_items, $acl);

src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php

@@ -29,6 +29,8 @@
  */
 namespace OPNsense\Base\Menu;
 
+use OPNsense\Core\Config;
+
 /**
  * Class MenuSystem
  * @package OPNsense\Base\Menu
@@ -101,6 +103,23 @@ class MenuSystem
                 }
             }
         }
+        // add interfaces to "Interfaces" menu tab... kind of a hack, may need some improvement.
+        $ifarr = array();
+        foreach (Config::getInstance()->object()->interfaces->children() as $key => $node) {
+            $ifarr[$key] = !empty($node->descr) ? $node->descr->__toString() : strtoupper($key);
+        }
+        natcasesort($ifarr);
+        $ordid = 0;
+        foreach ($ifarr as $key => $descr) {
+            $this->appendItem('Interfaces', $key, array(
+                'url' => '/interfaces.php?if='. $key,
+                'visiblename' => '[' . $descr . ']',
+                'cssclass' => 'fa fa-sitemap',
+                'order' => $ordid++,
+            ));
+        }
+        unset($ifarr);
+
     }
 
     /**

src/www/head.inc

@@ -15,24 +15,6 @@ function system_get_language_code() {
 
 // link menu system
 $menu = new OPNsense\Base\Menu\MenuSystem();
-
-// add interfaces to "Interfaces" menu tab... kind of a hack, may need some improvement.
-$cnf = OPNsense\Core\Config::getInstance();
-$ifarr = array();
-foreach ($cnf->object()->interfaces->children() as $key => $node) {
-    $ifarr[$key] = !empty($node->descr) ? $node->descr->__toString() : strtoupper($key);
-}
-natcasesort($ifarr);
-$ordid = 0;
-foreach ($ifarr as $key => $descr) {
-    $menu->appendItem('Interfaces', $key, array(
-        'url' => '/interfaces.php?if=' . $key,
-        'visiblename' => '[' . $descr . ']',
-        'cssclass' => 'fa fa-sitemap',
-        'order' => $ordid++,
-    ));
-}
-unset($ifarr);
 $menuSystem = $menu->getItems($_SERVER['REQUEST_URI']);
 
 /* XXX workaround for dashboard */