Revert "Fix #6918 Allow aliases with capital letters in rules"

This reverts commit 9444a281f051e11d5456cc37b2a3f56fc8a7bc33.

(cherry picked from commit 9128641db5c9b6839163948f3f71ad139c7a4625)

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);