diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/local/www/interfaces_assign.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/interfaces_vlan.php | 9 | ||||
| -rw-r--r-- | src/usr/local/www/interfaces_vlan_edit.php | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index c6b730a..d99ee04 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -80,6 +80,10 @@ function interface_assign_description($portinfo, $portname) { global $ovpn_descrs; if ($portinfo['isvlan']) { $descr = sprintf(gettext('VLAN %1$s on %2$s'), $portinfo['tag'], $portinfo['if']); + $iface = convert_real_interface_to_friendly_interface_name($portinfo['if']); + if (isset($iface) && strlen($iface) > 0) { + $descr .= " - $iface"; + } if ($portinfo['descr']) { $descr .= " (" . $portinfo['descr'] . ")"; } diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index 32ba6ed..a78bc55 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -150,7 +150,14 @@ display_top_tabs($tab_array); foreach ($a_vlans as $vlan) { ?> <tr> - <td><?=htmlspecialchars($vlan['if']);?></td> + <td> +<?php + printf("%s", htmlspecialchars($vlan['if'])); + $iface = convert_real_interface_to_friendly_interface_name($vlan['if']); + if (isset($iface) && strlen($iface) > 0) + printf(" (%s)", htmlspecialchars($iface)); +?> + </td> <td><?=htmlspecialchars($vlan['tag']);?></td> <td><?=htmlspecialchars($vlan['pcp']);?></td> <td><?=htmlspecialchars($vlan['descr']);?></td> diff --git a/src/usr/local/www/interfaces_vlan_edit.php b/src/usr/local/www/interfaces_vlan_edit.php index a6743d0..f281dda 100644 --- a/src/usr/local/www/interfaces_vlan_edit.php +++ b/src/usr/local/www/interfaces_vlan_edit.php @@ -193,6 +193,9 @@ function build_interfaces_list() { foreach ($portlist as $ifn => $ifinfo) { if (is_jumbo_capable($ifn)) { $list[$ifn] = $ifn . " (" . $ifinfo['mac'] . ")"; + $iface = convert_real_interface_to_friendly_interface_name($ifn); + if (isset($iface) && strlen($iface) > 0) + $list[$ifn] .= " - $iface"; } } |
