From 6ddff9e021bcc18a08aa77a5c3ddd1dfb6fe721c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 16 Aug 2019 12:13:35 +0200
Subject: [PATCH] interfaces/vlan, don't show vlan interfaces in edit form,
 remove get_interface_list() usage and filter the relevant types here. closes
 https://github.com/opnsense/core/issues/3648

---
 src/www/interfaces_vlan_edit.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/www/interfaces_vlan_edit.php b/src/www/interfaces_vlan_edit.php
index 6062c41b2..c88ed169d 100644
--- a/src/www/interfaces_vlan_edit.php
+++ b/src/www/interfaces_vlan_edit.php
@@ -162,22 +162,26 @@ legacy_html_escape_form_data($pconfig);
                     <td>
                       <select name="if" class="selectpicker">
 <?php
-                      $portlist = get_interface_list();
-                      /* add LAGG interfaces */
-                      if (isset($config['laggs']['lagg'])) {
-                          foreach ($config['laggs']['lagg'] as $lagg) {
-                              $portlist[$lagg['laggif']] = $lagg;
+                      $all_interfaces = legacy_config_get_interfaces(array('virtual' => false));
+                      $all_interface_data = legacy_interfaces_details();
+                      foreach ($all_interfaces as $intf) {
+                          if (!empty($intf['if']) && !empty($all_interface_data[$intf['if']])) {
+                              $all_interface_data[$intf['if']]['descr'] = $intf['descr'];
                           }
                       }
-                      foreach ($portlist as $ifn => $ifinfo): ?>
+                      foreach ($all_interface_data as $ifn => $ifinfo):
+                        if (strpos($ifn, "_vlan") > 1 || strpos($ifn, "lo") === 0 || strpos($ifn, "enc") === 0 ||
+                              strpos($ifn, "pflog") === 0 || strpos($ifn, "pfsync") === 0 ||
+                              strpos($ifn, "ipsec") === 0){
+                            continue;
+                        }?>
+
                         <option value="<?=$ifn;?>" <?=$ifn == $pconfig['if'] ? " selected=\"selected\"" : "";?>>
                           <?=htmlspecialchars($ifn);?>
-                          ( <?= !empty($ifinfo['mac']) ? $ifinfo['mac'] :"" ;?> )
+                          ( <?= !empty($ifinfo['macaddr']) ? $ifinfo['macaddr'] :"" ;?> )
 <?php
-                          if (!empty($ifinfo['friendly'])):?>
-                          [
-                          <?=!empty($config['interfaces'][$ifinfo['friendly']]['descr']) ? htmlspecialchars($config['interfaces'][$ifinfo['friendly']]['descr']) : $ifinfo['friendly'];?>
-                          ]
+                          if (!empty($ifinfo['descr'])):?>
+                          [<?=htmlspecialchars($ifinfo['descr']);?>]
 <?php
                           endif;?>
                         </option>