From: Dirk Brenken <dev@brenken.org>
Date: Wed, 28 Nov 2018 12:55:42 +0000 (+0100)
Subject: luci-app-firewall: remove hinting
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F2342%2Fhead;p=oweals%2Fluci.git

luci-app-firewall: remove hinting

Remove firewall hinting as discussed in #2340

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
index 1bb86821e..38f36b49c 100644
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
@@ -76,30 +76,12 @@
 			var n = document.getElementById('_newfwd.name');
 			var p = document.getElementById('_newfwd.proto');
 			var i = document.getElementById('_newfwd.intport');
-			var hints = {
-			/*  port    name     0=both, 1=tcp, 2=udp, 3=other */
-				21:   [ 'FTP',   1 ],
-				22:   [ 'SSH',   1 ],
-				53:   [ 'DNS',   0 ],
-				80:   [ 'HTTP',  1 ],
-				443:  [ 'HTTPS', 1 ],
-				3389: [ 'RDP',   1 ],
-				5900: [ 'VNC',   1 ],
-			};
 
 			if (!this.className.match(/invalid/))
 			{
 				if (!i.value) i.value = this.value;
 
-				var hint = hints[this.value || 0] || hints[i.value || 0];
-				if (hint)
-				{
-					p.selectedIndex = hint[1];
-
-					if (!n.value)
-						n.value = hint[0];
-				}
-				else if (!n.value)
+				if (!n.value)
 				{
 					n.value = 'Forward' + this.value;
 				}
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
index c02fc20f9..e0092a7a5 100644
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
@@ -76,25 +76,10 @@
 			function() {
 				var n = document.getElementById('_newopen.name');
 				var p = document.getElementById('_newopen.proto');
-				var hints = {
-				/*  port    name     0=both, 1=tcp, 2=udp, 3=other */
-					22:   [ 'SSH',   1 ],
-					53:   [ 'DNS',   0 ],
-					80:   [ 'HTTP',  1 ],
-					443:  [ 'HTTPS', 1 ],
-				};
 
 				if (!this.className.match(/invalid/))
 				{
-					var hint = hints[this.value || 0];
-					if (hint)
-					{
-						p.selectedIndex = hint[1];
-
-						if (!n.value)
-							n.value = hint[0];
-					}
-					else if (!n.value && this.value)
+					if (!n.value && this.value)
 					{
 						n.value = 'Open' + this.value;
 					}