diff options
author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-11-15 21:45:37 -0600 |
---|---|---|
committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-11-16 08:16:14 -0600 |
commit | ba814883aac7bcd7cfb748c2079ba1b74236d226 (patch) | |
tree | bdb94de403c7c71afee012eda008fa40e8e0b1aa /src/usr/local | |
parent | 8100374ec15947e8f1b0f4d644b06c3a31382cf6 (diff) | |
download | pfsense-ba814883aac7bcd7cfb748c2079ba1b74236d226.zip pfsense-ba814883aac7bcd7cfb748c2079ba1b74236d226.tar.gz |
Revert "Fix #6918 Allow aliases with capital letters in rules"
This reverts commit 9444a281f051e11d5456cc37b2a3f56fc8a7bc33.
(cherry picked from commit 9128641db5c9b6839163948f3f71ad139c7a4625)
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/classes/Form/IpAddress.class.php | 17 | ||||
-rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 5 |
2 files changed, 2 insertions, 20 deletions
diff --git a/src/usr/local/www/classes/Form/IpAddress.class.php b/src/usr/local/www/classes/Form/IpAddress.class.php index 0100526..9a2cc16 100644 --- a/src/usr/local/www/classes/Form/IpAddress.class.php +++ b/src/usr/local/www/classes/Form/IpAddress.class.php @@ -77,23 +77,6 @@ class Form_IpAddress extends Form_Input $this->_attributes['title'] = 'An IPv6 address like 1:2a:3b:ffff::1'; $this->_attributes['onChange'] = 'javascript:this.value=this.value.toLowerCase();'; break; - - case "ALIASV4V6": - $this->_attributes['pattern'] = '[a-zA-Z0-9_.:]+'; - $this->_attributes['title'] = 'An IPv4 address like 1.2.3.4 or an IPv6 address like 1:2a:3b:ffff::1 or an alias'; - $this->_attributes['onChange'] = 'javascript:if (this.value.indexOf(":") > -1) {this.value=this.value.toLowerCase();}'; - break; - - case "ALIASV4": - $this->_attributes['pattern'] = '[a-zA-Z0-9_.:]+'; - $this->_attributes['title'] = 'An IPv4 address like 1.2.3.4 or an alias'; - break; - - case "ALIASV6": - $this->_attributes['pattern'] = '[a-zA-Z0-9_.:]+'; - $this->_attributes['title'] = 'An IPv6 address like 1:2a:3b:ffff::1 or an alias'; - $this->_attributes['onChange'] = 'javascript:if (this.value.indexOf(":") > -1) {this.value=this.value.toLowerCase();}'; - break; } } diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 92f1f53..cbadfd8 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1354,9 +1354,8 @@ foreach (['src' => 'Source', 'dst' => 'Destination'] as $type => $name) { $group->add(new Form_IpAddress( $type, $name .' Address', - $pconfig[$type], - 'ALIASV4V6' - ))->addMask($type .'mask', $pconfig[$type.'mask']); + $pconfig[$type] + ))->addMask($type .'mask', $pconfig[$type.'mask'])->setPattern('[a-zA-Z0-9_.:]+'); $section->add($group); |