diff options
| author | jim-p <jimp@pfsense.org> | 2016-12-02 12:12:38 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-12-02 12:15:05 -0500 |
| commit | d2ce7d30c3a6af60a79e6d43a847ab2237ad9cd6 (patch) | |
| tree | 690cdefd63de518f6b43a462a10546dbceb5bfec /src/usr/local/www/firewall_virtual_ip_edit.php | |
| parent | 778f988534218cc9e29ee9cb166a56beec8aaf0b (diff) | |
| download | pfsense-d2ce7d30c3a6af60a79e6d43a847ab2237ad9cd6.zip pfsense-d2ce7d30c3a6af60a79e6d43a847ab2237ad9cd6.tar.gz | |
Fix 'Other' type VIP options. Ticket #6094
While here, remove some defunct 'range' code that was never used.
Diffstat (limited to 'src/usr/local/www/firewall_virtual_ip_edit.php')
| -rw-r--r-- | src/usr/local/www/firewall_virtual_ip_edit.php | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php index 951b53e..02ff722 100644 --- a/src/usr/local/www/firewall_virtual_ip_edit.php +++ b/src/usr/local/www/firewall_virtual_ip_edit.php @@ -72,7 +72,6 @@ if (isset($id) && $a_vip[$id]) { $pconfig['advskew'] = $a_vip[$id]['advskew']; $pconfig['advbase'] = $a_vip[$id]['advbase']; $pconfig['password'] = $a_vip[$id]['password']; - $pconfig['range'] = $a_vip[$id]['range']; $pconfig['subnet'] = $a_vip[$id]['subnet']; $pconfig['subnet_bits'] = $a_vip[$id]['subnet_bits']; $pconfig['noexpand'] = $a_vip[$id]['noexpand']; @@ -210,14 +209,8 @@ if ($_POST) { $vipent['mode'] = $_POST['mode']; $vipent['interface'] = $_POST['interface']; - /* ProxyARP specific fields */ - if ($_POST['mode'] === "proxyarp") { - if ($_POST['type'] == "range") { - $vipent['range']['from'] = $_POST['range_from']; - $vipent['range']['to'] = $_POST['range_to']; - - } - + /* ProxyARP & Other specific fields */ + if (($_POST['mode'] === "proxyarp") || ($_POST['mode'] === "other")) { $vipent['noexpand'] = isset($_POST['noexpand']); } @@ -373,7 +366,7 @@ $section->addInput(new Form_Select( $section->addInput(new Form_Select( 'type', 'Address type', - ((!$pconfig['range'] && $pconfig['subnet_bits'] == 32) || (!isset($pconfig['subnet']))) ? 'single':'network', + (!isset($pconfig['subnet'])) ? 'single':'network', array( 'single' => gettext('Single address'), 'network' => gettext('Network') @@ -508,10 +501,12 @@ events.push(function() { $('#address_note').html("<?=$proxyarphelp?>"); disableInput('type', false); disableInput('subnet_bits', ($('#type').val() == 'single')); + hideCheckbox('noexpand', false); } else { $('#address_note').html(''); disableInput('type', false); disableInput('subnet_bits', ($('#type').val() == 'single')); + hideCheckbox('noexpand', false); } } |
