From 49df30eb83333344b4de1fd61fa6a2aa6bf6c4f2 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 14 Sep 2023 21:42:00 +0200
Subject: [PATCH] interfaces: do not annotate disabled state for members

Recently did the same for Unbound.  The context for the user is clear
and we shouldn't be too concerned for what the user thinks about disabled
interfaces since he disabled them in the first place.

Use the same interface description source in the overview page.
---
 src/www/interfaces_bridge.php      | 7 ++++++-
 src/www/interfaces_bridge_edit.php | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/www/interfaces_bridge.php b/src/www/interfaces_bridge.php
index fb993a1e5..c7e1948d1 100644
--- a/src/www/interfaces_bridge.php
+++ b/src/www/interfaces_bridge.php
@@ -114,7 +114,12 @@ legacy_html_escape_form_data($a_bridges);
                     <tbody>
 <?php
                     $i = 0;
-                    $ifdescrs = get_configured_interface_with_descr();
+                    $ifdescrs = [];
+                    foreach (legacy_config_get_interfaces(['virtual' => false]) as $intf => $intfdata) {
+                        if (substr($intfdata['if'], 0, 3) != 'gre' && substr($intfdata['if'], 0, 2) != 'lo') {
+                            $ifdescr[$intf] = $intfdata['descr'];
+                        }
+                    }
                     foreach ($a_bridges as $bridge): ?>
                       <tr>
                         <td><?= $bridge['bridgeif'] ?></td>
diff --git a/src/www/interfaces_bridge_edit.php b/src/www/interfaces_bridge_edit.php
index 90a613ef9..3fce0ed76 100644
--- a/src/www/interfaces_bridge_edit.php
+++ b/src/www/interfaces_bridge_edit.php
@@ -39,9 +39,6 @@ $ifacelist = [];
 foreach (legacy_config_get_interfaces(['virtual' => false]) as $intf => $intfdata) {
     if (substr($intfdata['if'], 0, 3) != 'gre' && substr($intfdata['if'], 0, 2) != 'lo') {
         $ifacelist[$intf] = $intfdata['descr'];
-        if (!isset($intfdata['enable'])) {
-            $ifacelist[$intf] .= ' (' . gettext('disabled') . ')';
-        }
     }
 }