Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2342 from dibdot/fw

Browse source 
luci-app-firewall: remove hinting
This commit is contained in:
Dirk Brenken 2018-11-28 13:59:30 +01:00 committed by GitHub
commit 98cde82e4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
View file

@ -76,30 +76,12 @@
var n = document.getElementById('_newfwd.name'); var n = document.getElementById('_newfwd.name');
var p = document.getElementById('_newfwd.proto'); var p = document.getElementById('_newfwd.proto');
var i = document.getElementById('_newfwd.intport'); 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 (!this.className.match(/invalid/))
{ {
if (!i.value) i.value = this.value; if (!i.value) i.value = this.value;
var hint = hints[this.value || 0] || hints[i.value || 0]; if (!n.value)
if (hint)
{
p.selectedIndex = hint[1];
if (!n.value)
n.value = hint[0];
}
else if (!n.value)
{ {
n.value = 'Forward' + this.value; n.value = 'Forward' + this.value;
} }

17
applications/luci-app-firewall/luasrc/view/firewall/cbi_addrule.htm
View file

@ -76,25 +76,10 @@
function() { function() {
var n = document.getElementById('_newopen.name'); var n = document.getElementById('_newopen.name');
var p = document.getElementById('_newopen.proto'); 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/)) if (!this.className.match(/invalid/))
{ {
var hint = hints[this.value || 0]; if (!n.value && this.value)
if (hint)
{
p.selectedIndex = hint[1];
if (!n.value)
n.value = hint[0];
}
else if (!n.value && this.value)
{ {
n.value = 'Open' + this.value; n.value = 'Open' + this.value;
} }