lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ad Schellevis 2019-08-16 12:13:35 +02:00
parent 4531ceea4d
commit 6ddff9e021
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/www/interfaces_vlan_edit.php
View File

@ -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>