diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-04 14:57:27 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-04 14:57:27 -0400 |
commit | 5c2557832550b85a42a4ac500d4cf32e8b498a46 (patch) | |
tree | fd6f98d4bfbfe173b7f9fce07b34f5d9879de520 /src/usr/local | |
parent | 6aef15f8cfa409d19e421bf2858667ca5de5026b (diff) | |
download | pfsense-5c2557832550b85a42a4ac500d4cf32e8b498a46.zip pfsense-5c2557832550b85a42a4ac500d4cf32e8b498a46.tar.gz |
Fixed #5102
Provided new method addVPNMask() that creates a mask selector including '0'
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/classes/Form/IpAddress.class.php | 13 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_phase2.php | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/usr/local/www/classes/Form/IpAddress.class.php b/src/usr/local/www/classes/Form/IpAddress.class.php index 759b65d..e45cc38 100644 --- a/src/usr/local/www/classes/Form/IpAddress.class.php +++ b/src/usr/local/www/classes/Form/IpAddress.class.php @@ -50,6 +50,19 @@ class Form_IpAddress extends Form_Input return $this; } + // Masks on vpn_ipsec* pages allow a mask of '0' + public function addVPNMask($name, $value, $max = 128) + { + $this->_mask = new Form_Select( + $name, + null, + $value, + array_combine(range($max, 0), range($max, 0)) + ); + + return $this; + } + public function setIsRepeated() { if (isset($this->_mask)) diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index a25aa7e..80c0734 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -532,7 +532,7 @@ $group->add(new Form_IpAddress( 'localid_address', null, $pconfig['localid_address'] -))->setHelp('Address')->addMask(localid_netbits, $pconfig['localid_netbits']); +))->setHelp('Address')->addVPNMask(localid_netbits, $pconfig['localid_netbits']); $section->add($group); @@ -557,7 +557,7 @@ $group->add(new Form_IpAddress( 'natlocalid_address', null, $pconfig['localid_address'] -))->setHelp('Address')->addMask(natlocalid_netbits, $pconfig['natlocalid_netbits']); +))->setHelp('Address')->addVPNMask(natlocalid_netbits, $pconfig['natlocalid_netbits']); $group->setHelp('If NAT/BINAT is required on this network specify the address to be translated'); $section->add($group); @@ -576,7 +576,7 @@ $group->add(new Form_IpAddress( 'remoteid_address', null, $pconfig['remoteid_address'] -))->setHelp('Address')->addMask(remoteid_netbits, $pconfig['remoteid_netbits']); +))->setHelp('Address')->addVPNMask(remoteid_netbits, $pconfig['remoteid_netbits']); $section->add($group); |