diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-02-18 20:14:02 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-02-18 20:14:02 -0300 |
| commit | 79ea2726b5c1c2a723e915a2d4d9cc983d216062 (patch) | |
| tree | 7940b19234543a0435fcece8e6ea45b611a394ca | |
| parent | 9e696e9ae5f3138a7d95b84c1b943c0ee0bbc17e (diff) | |
| download | pfsense-79ea2726b5c1c2a723e915a2d4d9cc983d216062.zip pfsense-79ea2726b5c1c2a723e915a2d4d9cc983d216062.tar.gz | |
Display right interface name on alias list when alias interface os CARP. Fixes #2824
| -rwxr-xr-x | usr/local/www/firewall_virtual_ip.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index f9eae9c..c8a8c01 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -201,6 +201,12 @@ include("head.inc"); </table> </td> </tr> + <?php + $interfaces = get_configured_interface_with_descr(false, true); + $carplist = get_configured_carp_interface_list(); + foreach ($carplist as $cif => $carpip) + $interfaces[$cif] = $carpip." (".get_vip_descr($carpip).")"; + ?> <?php $i = 0; foreach ($a_vip as $vipent): ?> <?php if($vipent['subnet'] <> "" or $vipent['range'] <> "" or $vipent['subnet_bits'] <> "" or (isset($vipent['range']['from']) && $vipent['range']['from'] <> "")): ?> @@ -215,7 +221,7 @@ include("head.inc"); <?php if($vipent['mode'] == "carp") echo " (vhid {$vipent['vhid']})"; ?> </td> <td class="listr" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';"> - <?=htmlspecialchars(strtoupper($config['interfaces'][$vipent['interface']]['descr']));?> + <?=htmlspecialchars($interfaces[$vipent['interface']]);?> </td> <td class="listr" align="center" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';"> <?php if($vipent['mode'] == "proxyarp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_parp.gif' title='Proxy ARP'>"; elseif($vipent['mode'] == "carp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_carp.gif' title='CARP'>"; elseif($vipent['mode'] == "other") echo "<img src='./themes/".$g['theme']."/images/icons/icon_other.gif' title='Other'>"; elseif($vipent['mode'] == "ipalias") echo "<img src='./themes/".$g['theme']."/images/icons/icon_ifalias.gif' title='IP Alias'>";?> |
