diff --git a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js index cd8e32afc..ea5c8b191 100644 --- a/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js +++ b/luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js @@ -215,7 +215,7 @@ return view.extend({ let ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id); try { - let url = new URL(value); + let url = new URL(value.replace(/^.*:\/\//, 'http://')); if (stubValidator.apply('hostname', url.hostname)) return true; else if (stubValidator.apply('ip4addr', url.hostname)) @@ -249,7 +249,7 @@ return view.extend({ return _('Expecting: %s').format(_('non-empty value')); try { - let url = new URL(value); + let url = new URL(value.replace(/^.*:\/\//, 'http://')); if (stubValidator.apply('hostname', url.hostname)) return true; else if (stubValidator.apply('ip4addr', url.hostname)) @@ -831,7 +831,7 @@ return view.extend({ return _('Expecting: %s').format(_('non-empty value')); try { - let url = new URL(value); + let url = new URL(value.replace(/^.*:\/\//, 'http://')); if (stubValidator.apply('hostname', url.hostname)) return true; else if (stubValidator.apply('ip4addr', url.hostname)) diff --git a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc index 7d1603e7f..d1e97183b 100755 --- a/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc +++ b/luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc @@ -574,7 +574,7 @@ function main() { if (main_node === 'urltest') { main_urltest_nodes = filter(uci.get(uciconfig, ucimain, 'main_urltest_nodes'), (v) => { if (!uci.get(uciconfig, v)) { - log(sprintf('Node %s is gone, removing from urltest list.', node)); + log(sprintf('Node %s is gone, removing from urltest list.', v)); return false; } return true; @@ -594,7 +594,7 @@ function main() { if (main_udp_node === 'urltest') { main_udp_urltest_nodes = filter(uci.get(uciconfig, ucimain, 'main_udp_urltest_nodes'), (v) => { if (!uci.get(uciconfig, v)) { - log(sprintf('Node %s is gone, removing from urltest list.', node)); + log(sprintf('Node %s is gone, removing from urltest list.', v)); return false; } return true;