diff --git a/autoinstall/2.x/autoinstall.sh b/autoinstall/2.x/autoinstall.sh
index 8a7b08e..2eca4f4 100755
--- a/autoinstall/2.x/autoinstall.sh
+++ b/autoinstall/2.x/autoinstall.sh
@@ -12,7 +12,7 @@ HTTPS_DNS_PROXY=1
OWRT_VERSION="current"
RUAB_VERSION="2.1.10-r1"
RUAB_MOD_LUA_VERSION="2.1.10-r1"
-RUAB_LUCI_APP_VERSION="2.1.10-r1"
+RUAB_LUCI_APP_VERSION="2.1.10-r2"
BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master"
PKG_DIR="/tmp"
diff --git a/luci-app-ruantiblock/Makefile b/luci-app-ruantiblock/Makefile
index dda935d..50f1f57 100644
--- a/luci-app-ruantiblock/Makefile
+++ b/luci-app-ruantiblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ruantiblock
PKG_VERSION:=2.1.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
LUCI_TITLE:=LuCI support for ruantiblock
LUCI_DEPENDS:=+ruantiblock
LUCI_PKGARCH:=all
diff --git a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js
index a7ddeb8..5486dfa 100644
--- a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js
+++ b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/settings.js
@@ -26,7 +26,7 @@ return view.extend({
},
validateUrl(section, value) {
- return (/^$|^https?:\/\/[\w.-]+(:[0-9]{2,5})?[\w\/~.&?+=-]*$/.test(value)) ? true : _('Expecting:')
+ return (/^$|^https?:\/\/[\w.-]+(:[0-9]{2,5})?((\/|\?).*)?$/.test(value)) ? true : _('Expecting:')
+ ` ${_('valid URL')}\n`;
},
@@ -653,7 +653,7 @@ return view.extend({
'user-entries',
tools.userListsDir + '/' + s.section,
_('Edit entries'),
- _('One entry (IP, CIDR or FQDN) per line. In the FQDN records, you can specify the DNS server for resolving this domain (separated by a space). You can also comment on lines (# is the first character of a line).
Examples:') +
+ _('One entry (IP, CIDR or FQDN) per line. In the FQDN records, you can specify the DNS server for resolving this domain (separated by a space). You can also comment out the lines (# is the first character of a line).
Examples:') +
'
#comment
domain.net
sub.domain.com 8.8.8.8
sub.domain.com 8.8.8.8#53
74.125.131.19
74.125.0.0/16'
);