diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php index 7b3ce994d..8f7fa387b 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php @@ -206,16 +206,16 @@ class ControllerBase extends ControllerRoot $ifarr = array(); foreach ($cnf->object()->interfaces->children() as $key => $node) { - $ifarr[$key] = $node; + $ifarr[$key] = $node->descr ? $node->descr->__toString() : strtoupper($key); } - ksort($ifarr); + natcasesort($ifarr); $ordid = 0; - foreach ($ifarr as $key => $node) { + foreach ($ifarr as $key => $descr) { $menu->appendItem('Interfaces', $key, array( 'url' => '/interfaces.php?if='. $key, - 'order' => ($ordid++), - 'visiblename' => $node->descr ? $node->descr : strtoupper($key), + 'visiblename' => '[' . $descr . ']', 'cssclass' => 'fa fa-sitemap', + 'order' => $ordid++, )); } unset($ifarr); diff --git a/src/www/fbegin.inc b/src/www/fbegin.inc index 582b45ad3..5648f4e75 100644 --- a/src/www/fbegin.inc +++ b/src/www/fbegin.inc @@ -73,16 +73,16 @@ $menu = new OPNsense\Base\Menu\MenuSystem(); $cnf = OPNsense\Core\Config::getInstance(); $ifarr = array(); foreach ($cnf->object()->interfaces->children() as $key => $node) { - $ifarr[$key] = $node; + $ifarr[$key] = $node->descr ? $node->descr->__toString() : strtoupper($key); } -ksort($ifarr); +natcasesort($ifarr); $ordid = 0; -foreach ($ifarr as $key => $node) { +foreach ($ifarr as $key => $descr) { $menu->appendItem('Interfaces', $key, array( 'url' => '/interfaces.php?if=' . $key, - 'order' => ($ordid++), - 'visiblename' => $node->descr ? $node->descr : strtoupper($key), + 'visiblename' => '[' . $descr . ']', 'cssclass' => 'fa fa-sitemap', + 'order' => $ordid++, )); } unset($ifarr);