diff --git a/applications/luci-app-banip/Makefile b/applications/luci-app-banip/Makefile index 5231e2ea1e..783fc06475 100644 --- 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.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_MAINTAINER:=Dirk Brenken diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/allowlist.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/allowlist.js index 30ba7038db..3b068982e9 100644 --- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/allowlist.js +++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/allowlist.js @@ -66,4 +66,4 @@ return view.extend({ handleSaveApply: null, handleReset: null -}); \ No newline at end of file +}); diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/blocklist.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/blocklist.js index 9832f2c952..40d41ba08e 100644 --- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/blocklist.js +++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/blocklist.js @@ -66,4 +66,4 @@ return view.extend({ handleSaveApply: null, handleReset: null -}); \ No newline at end of file +}); diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js index 11a629d64d..1b8bbf47a5 100644 --- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js +++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/feeds.js @@ -213,7 +213,7 @@ return view.extend({ if (!value) { return true; } - if (!value.match(/^https?:\/\/[A-Za-z0-9\[\]\/.\-?&+_@%=:~#]+$/)) { + if (!value.match(/^https?:\/\/[A-Za-z0-9[\]/.?&+_@%=:~#-]+$/)) { return _('Protocol/URL format not supported'); } return true; @@ -224,7 +224,7 @@ return view.extend({ if (!value) { return true; } - if (!value.match(/^https?:\/\/[A-Za-z0-9\[\]\/.\-?&+_@%=:~#]+$/)) { + if (!value.match(/^https?:\/\/[A-Za-z0-9[\]/.?&+_@%=:~#-]+$/)) { return _('Protocol/URL format not supported'); } return true; @@ -258,7 +258,7 @@ return view.extend({ if (!value) { return true; } - if (!value.match(/^(\bgz\b|\btcp\b|\budp\b|\b[0-9\-]+\b| )*$/)) { + if (!value.match(/^(\bgz\b|\btcp\b|\budp\b|\b[0-9-]+\b| )*$/)) { return _('Flag not supported'); } return true; @@ -320,4 +320,4 @@ return view.extend({ handleSaveApply: null, handleSave: null, handleReset: null -}); \ No newline at end of file +}); diff --git a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/logtemplate.js b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/logtemplate.js index 9ac4d6752c..22160d1d5d 100644 --- a/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/logtemplate.js +++ b/applications/luci-app-banip/htdocs/luci-static/resources/view/banip/logtemplate.js @@ -73,4 +73,4 @@ function Logview(logtag, name) { }); } -return L.Class.extend({ Logview }); \ No newline at end of file +return L.Class.extend({ Logview });