Fixed #159

Author: null93

src/skin/adminhtml/base/default/js/cloudflare/firewall/access_rules.js

@@ -205,17 +205,17 @@ $(document).on ( "cloudflare.firewall.access_rules.add", function ( event, data
 	var note = $(data.section).find ("[name='note']").val ()
 	var target = ""
 	switch ( true ) {
-		case /[0-9]+(?:\.[0-9]+){3}\/[0-9]+/.test ( value ):
-			target = "ip_range"
-			break
-		case /[0-9]+(?:\.[0-9]+){3}/.test ( value ):
-			target = "ip"
+		case /^[a-z]{2}$/i.test ( value ):
+			target = "country"
 			break
 		case /AS[0-9]+/.test ( value ):
 			target = "asn"
 			break
+		case /\//.test ( value ):
+			target = "ip_range"
+			break
 		default:
-			target = "country"
+			target = "ip"
 	}
 	$.ajax ({
 		url: data.form.endpoint,

src/skin/adminhtml/base/default/js/cloudflare/firewall/zone_lockdown.js

@@ -174,12 +174,11 @@ $(document).on ( "cloudflare.firewall.zone_lockdown.edit", function ( event, dat
 				"paused": paused,
 				"configurations": configurations.split ("\n")
 					.map ( e => e.trim () )
-					.filter ( e => /^\d{1,3}(?:\.\d{1,3}){3}(?:\/\d{1,2})?$/m.test ( e) )
+					.filter ( e => !!e )
 					.map ( e => {
-						var match = e.match (/^(\d{1,3}(?:\.\d{1,3}){3})(?:\/(\d{1,2}))?$/m)
 						return {
-							target: match [ 2 ] ? "ip_range" : "ip",
-							value: e,
+							target: /\//.test ( e ) ? "ip_range" : "ip",
+							value: e.trim (),
 						}
 					}),
 				"urls": urls.split ("\n")
@@ -247,12 +246,11 @@ $(document).on ( "cloudflare.firewall.zone_lockdown.create", function ( event, d
 				"paused": status,
 				"configurations": configurations.split ("\n")
 					.map ( e => e.trim () )
-					.filter ( e => /^\d{1,3}(?:\.\d{1,3}){3}(?:\/\d{1,2})?$/m.test ( e) )
+					.filter ( e => !!e )
 					.map ( e => {
-						var match = e.match (/^(\d{1,3}(?:\.\d{1,3}){3})(?:\/(\d{1,2}))?$/m)
 						return {
-							target: match [ 2 ] ? "ip_range" : "ip",
-							value: e,
+							target: /\//.test ( e ) ? "ip_range" : "ip",
+							value: e.trim (),
 						}
 					}),
 				"urls": urls.split ("\n")