diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-09-11 16:03:28 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-09-11 16:04:26 -0400 |
commit | 784b435bce55034ab407cd51552d57d379300a53 (patch) | |
tree | bbec2727553457cba938a54440ee763e04f15b2b /src/usr | |
parent | c38aad85f745ee20450923c28818642b8d1f7f2d (diff) | |
download | pfsense-784b435bce55034ab407cd51552d57d379300a53.zip pfsense-784b435bce55034ab407cd51552d57d379300a53.tar.gz |
Revised all pages with autocomplete to accommodate host names in validation and change port inputs to 'text'
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/classes/Form/IpAddress.class.php | 2 | ||||
-rwxr-xr-x | src/usr/local/www/firewall_aliases_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_1to1_edit.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_edit.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_out_edit.php | 16 | ||||
-rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 14 | ||||
-rw-r--r-- | src/usr/local/www/services_router_advertisements.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/system_routes_edit.php | 84 |
8 files changed, 78 insertions, 58 deletions
diff --git a/src/usr/local/www/classes/Form/IpAddress.class.php b/src/usr/local/www/classes/Form/IpAddress.class.php index f071c1b..be2f4c1 100644 --- a/src/usr/local/www/classes/Form/IpAddress.class.php +++ b/src/usr/local/www/classes/Form/IpAddress.class.php @@ -58,7 +58,7 @@ class Form_IpAddress extends Form_Input return parent::setIsRepeated(); } - + protected function _getInput() { $input = parent::_getInput(); diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index bad98c2..2b70d02 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -704,7 +704,7 @@ while ($counter < count($addresses)) { 'address' . $counter, null, $address - ))->addMask('address_subnet' . $counter, $address_subnet)->setWidth(4)->setAttribute('pattern', '[0-9:a-z:A-Z:.:]*'); + ))->addMask('address_subnet' . $counter, $address_subnet)->setWidth(4)->setPattern('[0-9, a-z, A-Z and .'); $group->add(new Form_Input( 'detail' . $counter, diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index 2b8834f..e051f2b 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -459,7 +459,7 @@ $group->add(new Form_IpAddress( 'src', null, is_specialnet($pconfig['src']) ? '': $pconfig['src'] -))->addMask('srcmask', $pconfig['srcmask'], 31)->setHelp('Address/mask'); +))->addMask('srcmask', $pconfig['srcmask'], 31)->setHelp('Address/mask')->setPattern('[0-9, a-z, A-Z and .'); $group->setHelp('Enter the internal (LAN) subnet for the 1:1 mapping. ' . 'The subnet size specified for the internal subnet will be applied to the external subnet.'); @@ -486,7 +486,7 @@ $group->add(new Form_IpAddress( 'dst', null, is_specialnet($pconfig['dst']) ? '': $pconfig['dst'] -))->addMask('dstmask', $pconfig['dstmask'], 31)->setHelp('Address/mask'); +))->addMask('dstmask', $pconfig['dstmask'], 31)->setHelp('Address/mask')->setPattern('[0-9, a-z, A-Z and .'); $group->setHelp('The 1:1 mapping will only be used for connections to or from the specified destination. Hint: this is usually "Any".'); diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 633380e..7b63ff6 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -736,7 +736,7 @@ $group->add(new Form_Select( $group->add(new Form_Input( 'srcbeginport_cust', null, - 'number', + 'text', $pconfig['srcbeginport'], ['min' => '1', 'max' => '65536'] ))->setHelp('Custom'); @@ -751,7 +751,7 @@ $group->add(new Form_Select( $group->add(new Form_Input( 'srcendport_cust', null, - 'number', + 'text', $pconfig['srcendport'], ['min' => '1', 'max' => '65536'] ))->setHelp('Custom'); @@ -792,7 +792,7 @@ $group->add(new Form_Select( $group->add(new Form_Input( 'dstbeginport_cust', null, - 'number', + 'text', $pconfig['dstbeginport'], ['min' => '1', 'max' => '65536'] ))->setHelp('Custom'); @@ -807,7 +807,7 @@ $group->add(new Form_Select( $group->add(new Form_Input( 'dstendport_cust', null, - 'number', + 'text', $pconfig['dstendport'], ['min' => '1', 'max' => '65536'] ))->setHelp('Custom'); @@ -849,7 +849,7 @@ $group->setHelp('Specify the port on the machine with the IP address entered abo $group->add(new Form_Input( 'localbeginport_cust', null, - 'number', + 'text', $pconfig['localbeginport'], ['min' => '1', 'max' => '65536'] ))->setHelp('Custom'); diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index d7e8309..7b149db 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -517,14 +517,13 @@ $group->add(new Form_IpAddress( 'source', null, $pconfig['source'] -))->addMask('source_subnet', $pconfig['source_subnet'])->setHelp('Source network for the outbound NAT mapping.'); +))->addMask('source_subnet', $pconfig['source_subnet'])->setHelp('Source network for the outbound NAT mapping.')->setPattern('[0-9, a-z, A-Z and .'); $group->add(new Form_Input( 'sourceport', null, - 'number', - $pconfig['sourceport'], - ['min' => '1', 'max' => '65536'] + 'text', + $pconfig['sourceport'] ))->setHelp('Port')->setWidth('2'); $section->add($group); @@ -542,14 +541,13 @@ $group->add(new Form_IpAddress( 'destination', null, $pconfig['destination'] == "any" ? "":$pconfig['destination'] -))->addMask('destination_subnet', $pconfig['destination_subnet'])->setHelp('Destination network for the outbound NAT mapping.'); +))->addMask('destination_subnet', $pconfig['destination_subnet'])->setHelp('Destination network for the outbound NAT mapping.')->setPattern('[0-9, a-z, A-Z and .'); $group->add(new Form_Input( 'dstport', null, - 'number', - $pconfig['dstport'], - ['min' => '1', 'max' => '65536'] + 'text', + $pconfig['dstport'] ))->setHelp('Port')->setWidth('2'); $section->add($group); @@ -848,7 +846,7 @@ events.push(function(){ var addressarray = <?= json_encode(get_alias_list(array("host", "network", "openvpn", "urltable"))) ?>; var customarray = <?= json_encode(get_alias_list(array("port", "url_ports", "urltable_ports"))) ?>; - $('#localip, #source').autocomplete({ + $('#destination, #source').autocomplete({ source: addressarray }); diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 306fb36..5263af6 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1283,7 +1283,7 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { $type, $name .' Address', $pconfig[$type] - ))->addMask($type .'mask', $pconfig[$type.'mask']); + ))->addMask($type .'mask', $pconfig[$type.'mask'])->setPattern('[0-9, a-z, A-Z and .'); $section->add($group); @@ -1313,10 +1313,9 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { $group->add(new Form_Input( $type .'beginport_cust', null,//$name .' port begin custom', - 'number', - (isset($portValues[ $pconfig[$type .'beginport'] ]) ? null : $pconfig[$type .'beginport']), - ['min' => 1, 'max' => 65535] - ))->setHelp('Custom');; + 'text', + (isset($portValues[ $pconfig[$type .'beginport'] ]) ? null : $pconfig[$type .'beginport']) + ))->setHelp('Custom'); $group->add(new Form_Select( $type .'endport', @@ -1328,9 +1327,8 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { $group->add(new Form_Input( $type .'endport_cust', null,//$name .' port end custom', - 'number', - (isset($portValues[ $pconfig[$type .'endport'] ]) ? null : $pconfig[$type .'endport']), - ['min' => 1, 'max' => 65535] + 'text', + (isset($portValues[ $pconfig[$type .'endport'] ]) ? null : $pconfig[$type .'endport']) ))->setHelp('Custom'); diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index 5ab6f6f..6dc2bab 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -95,7 +95,7 @@ if ($config['installedpackages']['olsrd']) { } if (!$_GET['if']) { - $savemsg = "<p><b>" . gettext("The DHCPv6 Server can only be enabled on interfaces configured with static IP addresses") . ".</b></p>" . + $savemsg = "<p><b>" . gettext("The DHCPv6 Server can only be enabled on interfaces configured with static, non unique local IP addresses") . ".</b></p>" . "<p><b>" . gettext("Only interfaces configured with a static IP will be shown") . ".</b></p>"; } @@ -377,7 +377,7 @@ for($idx=1; $idx=<4; $idx++) { 'radns' . $idx, 'Server ' . $idx, $pconfig['radns' . $idx] - ))->setHelp(($idx < 4) ? '':'Leave blank to use the system default DNS servers - this interface\'s IP if DNS Forwarder or Resolver is enabled, otherwise the servers configured on the General page'); + ))->setPattern('[0-9, a-z, A-Z and .')->setHelp(($idx < 4) ? '':'Leave blank to use the system default DNS servers - this interface\'s IP if DNS Forwarder or Resolver is enabled, otherwise the servers configured on the General page'); } $section->addInput(new Form_Input( diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php index 74b55a1..2a1abe8 100644 --- a/src/usr/local/www/system_routes_edit.php +++ b/src/usr/local/www/system_routes_edit.php @@ -1,34 +1,59 @@ <?php /* system_routes_edit.php - part of m0n0wall (http://m0n0.ch/wall) - part of pfSense - Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - Copyright (C) 2010 Scott Ullrich - Copyright (C) 2013-2015 Electric Sheep Fencing, LP - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. */ +/* ==================================================================== + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * Copyright (c) 2004, 2005 Scott Ullrich + * Copyright (c) 2003-2004 Manuel Kasper <mk@neon1.net> + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgment: + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution. (http://www.pfsense.org/). + * + * 4. The names "pfSense" and "pfSense Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * coreteam@pfsense.org. + * + * 5. Products derived from this software may not be called "pfSense" + * nor may "pfSense" appear in their names without prior written + * permission of the Electric Sheep Fencing, LLC. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * + * "This product includes software developed by the pfSense Project + * for use in the pfSense software distribution (http://www.pfsense.org/). + * + * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * + * ==================================================================== + * + */ /* pfSense_MODULE: routing */ @@ -253,10 +278,10 @@ if (isset($id) && $a_routes[$id]) { $section = new Form_Section('Edit route entry'); $section->addInput(new Form_IpAddress( - 'network_subnet', + 'network', 'Destination network', $pconfig['network'] -))->addMask('network_subnet', $pconfig['network_subnet'])->setHelp('Destination network for this static route'); +))->addMask('network_subnet', $pconfig['network_subnet'])->setPattern('[a-zA-Z0-9_]+')->setHelp('Destination network for this static route'); $allGateways = array_combine( array_map(function($g){ return $g['name']; }, $a_gateways), @@ -296,7 +321,6 @@ events.push(function(){ // --------- Autocomplete ----------------------------------------------------------------------------------------- var addressarray = <?= json_encode(get_alias_list(array("host", "network"))) ?>; - $('#network').autocomplete({ source: addressarray }); |