diff options
| author | Pierre POMES <pierre.pomes@interface-tech.com> | 2010-12-06 20:26:58 -0500 |
|---|---|---|
| committer | Pierre POMES <pierre.pomes@interface-tech.com> | 2010-12-06 20:26:58 -0500 |
| commit | dd62256f08c00813b5618c2cb5189f8abcfa3337 (patch) | |
| tree | 7c904443c1d8f13f986996ed9a22243746880cf5 | |
| parent | 8d5b8c2033315fb49c2e259cce477998b0eeb2aa (diff) | |
| download | pfsense-dd62256f08c00813b5618c2cb5189f8abcfa3337.zip pfsense-dd62256f08c00813b5618c2cb5189f8abcfa3337.tar.gz | |
Fix vip descriptions in openvpn and ipsec screens. Ticket #1042
| -rw-r--r-- | etc/inc/interfaces.inc | 11 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 2 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_client.php | 4 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_server.php | 4 |
4 files changed, 16 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 9766dd9..ae4efc6 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3538,4 +3538,15 @@ EOD; unlink_if_exists($cron_file); } +function get_vip_descr($ipaddress) { + global $config; + + foreach ($config['virtualip']['vip'] as $vip) { + if ($vip['subnet'] == $ipaddress) { + return ($vip['descr']); + } + } + return ""; +} + ?> diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index c498858..bb0d103 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -509,7 +509,7 @@ function dpdchkbox_change() { $interfaces = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); foreach ($carplist as $cif => $carpip) - $interfaces[$cif] = strtoupper($cif) . " ({$carpip})"; + $interfaces[$cif] = $carpip." (".get_vip_descr($carpip).")"; foreach ($interfaces as $iface => $ifacename): ?> <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>> diff --git a/usr/local/www/vpn_openvpn_client.php b/usr/local/www/vpn_openvpn_client.php index e92d82e..96f67bf 100644 --- a/usr/local/www/vpn_openvpn_client.php +++ b/usr/local/www/vpn_openvpn_client.php @@ -457,10 +457,10 @@ if ($savemsg) $interfaces = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); foreach ($carplist as $cif => $carpip) - $interfaces[$cif.'|'.$carpip] = strtoupper($cif) . " ({$carpip})"; + $interfaces[$cif.'|'.$carpip] = $carpip." (".get_vip_descr($carpip).")"; $aliaslist = get_configured_ip_aliases_list(); foreach ($aliaslist as $aliasip => $aliasif) - $interfaces[$aliasif.'|'.$aliasip] = strtoupper($aliasif) . " ({$aliasip})"; + $interfaces[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; $interfaces['any'] = "any"; foreach ($interfaces as $iface => $ifacename): $selected = ""; diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php index bfb2076..9d7c00d 100644 --- a/usr/local/www/vpn_openvpn_server.php +++ b/usr/local/www/vpn_openvpn_server.php @@ -663,10 +663,10 @@ if ($savemsg) $interfaces = get_configured_interface_with_descr(); $carplist = get_configured_carp_interface_list(); foreach ($carplist as $cif => $carpip) - $interfaces[$cif.'|'.$carpip] = strtoupper($cif) . " ({$carpip})"; + $interfaces[$cif.'|'.$carpip] = $carpip." (".get_vip_descr($carpip).")"; $aliaslist = get_configured_ip_aliases_list(); foreach ($aliaslist as $aliasip => $aliasif) - $interfaces[$aliasif.'|'.$aliasip] = strtoupper($aliasif) . " ({$aliasip})"; + $interfaces[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; $interfaces['any'] = "any"; foreach ($interfaces as $iface => $ifacename): $selected = ""; |
