luci-app-banip: update 1.8.0-3

* more eslint fixes

Signed-off-by: Dirk Brenken <redacted>

diff --git a/applications/luci-app-banip/Makefile b/applications/luci-app-banip/Makefile
index 95ab5667c38372fad2e315084a99a578f4cbb24e..3a494c5091e968ecaeffb006296568c143b63eef 100644 (file)
--- a/applications/luci-app-banip/Makefile
+++ b/applications/luci-app-banip/Makefile
@@ -7,7 +7,7 @@ LUCI_TITLE:=LuCI support for banIP
 LUCI_DEPENDS:=+luci-base +banip
 
 PKG_VERSION:=1.8.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 

diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js
index 74dad93fd463c6a4f8cfe51a4debc95693253882..b3d119ec8b9e6ca6f0bb1776f33e6ca4bad73854 100644 (file)
--- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js
+++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/overview.js
@@ -353,7 +353,7 @@ return view.extend({
                o.optional = true;
                o.rmempty = true;
 
-               o = s.taboption('adv_chain', form.Value, 'ban_allowflag', _('Allow Protocol/Ports'), _('Always allow a protocol \(tcp/udp\) with certain ports or port ranges in WAN-Input and WAN-Forward chain.'));
+               o = s.taboption('adv_chain', form.Value, 'ban_allowflag', _('Allow Protocol/Ports'), _('Always allow a protocol (tcp/udp) with certain ports or port ranges in WAN-Input and WAN-Forward chain.'));
                o.placeholder = 'tcp 80 443-445';
                o.rmempty = true;
 
@@ -603,7 +603,7 @@ return view.extend({
                        if (!value) {
                                return _('Empty field not allowed');
                        }
-                       if (!value.match(/^[A-Za-z0-9\.\:]+$/)) {
+                       if (!value.match(/^[A-Za-z0-9.:]+$/)) {
                                return _('Invalid characters');
                        }
                        return true;
@@ -739,8 +739,8 @@ return view.extend({
                                if (!value) {
                                        return true;
                                }
-                               if (!value.match(/^(http:\/\/|https:\/\/)[A-Za-z0-9\/\.\-_\?\&\+=:~#]+$/)) {
-                                       return _('Protocol/URL format not supported');
+                               if (!value.match(/^(https?:\/\/)[A-Za-z0-9-]+\.[A-Za-z0-9.-]+(:[0-9]+)?(\/[A-Za-z0-9._\-?&+=:~#%]*)?$/)) {
+                                       return _('Invalid URL format');
                                }
                                return true;
                        }
@@ -775,6 +775,7 @@ return view.extend({
                o.rmempty = true;
 
                o = s.taboption('feeds', form.Value, 'ban_nftexpiry', _('Blocklist Set Expiry'), _('Expiry time for auto added blocklist Set members.'));
+               o.value('30ms');
                o.value('10s');
                o.value('1m');
                o.value('5m');
@@ -782,6 +783,7 @@ return view.extend({
                o.value('2h');
                o.value('1d');
                o.value('7d');
+               o.value('2w');
                o.placeholder = _('-- default --');
                o.optional = true;
                o.rmempty = true;