diff options
Diffstat (limited to 'applications')
3 files changed, 41 insertions, 47 deletions
diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index 20e3be869e..f546806849 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -7,7 +7,7 @@ PKG_NAME:=luci-app-https-dns-proxy PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_VERSION:=2023.11.19 -PKG_RELEASE:=r2 +PKG_RELEASE:=r3 LUCI_TITLE:=DNS Over HTTPS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy diff --git a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js index 1f22f6d6d7..8723b6e653 100644 --- a/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js +++ b/applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/status/include/71_https-dns-proxy.js @@ -105,46 +105,47 @@ return baseclass.extend({ ); var rows = []; - Object.values(reply.runtime.instances).forEach((element) => { - var resolver; - var address; - var port; - var name; - var option; - var found; - element.command.forEach((param, index, arr) => { - if (param === "-r") resolver = arr[index + 1]; - if (param === "-a") address = arr[index + 1]; - if (param === "-p") port = arr[index + 1]; - }); - resolver = resolver || "Unknown"; - address = address || "127.0.0.1"; - port = port || "Unknown"; - reply.providers.forEach((prov) => { - let regexp = pkg.templateToRegexp(prov.template); - if (!found && regexp.test(resolver)) { - found = true; - name = _(prov.title); - let match = resolver.match(regexp); - if (match[1] != null) { - if ( - prov.params && - prov.params.option && - prov.params.option.options - ) { - prov.params.option.options.forEach((opt) => { - if (opt.value === match[1]) option = _(opt.description); - }); - name += " (" + option + ")"; - } else { - if (match[1] !== "") name += " (" + match[1] + ")"; + if (reply.runtime.instances) { + Object.values(reply.runtime.instances).forEach((element) => { + var resolver; + var address; + var port; + var name; + var option; + var found; + element.command.forEach((param, index, arr) => { + if (param === "-r") resolver = arr[index + 1]; + if (param === "-a") address = arr[index + 1]; + if (param === "-p") port = arr[index + 1]; + }); + resolver = resolver || "Unknown"; + address = address || "127.0.0.1"; + port = port || "Unknown"; + reply.providers.forEach((prov) => { + let regexp = pkg.templateToRegexp(prov.template); + if (!found && regexp.test(resolver)) { + found = true; + name = _(prov.title); + let match = resolver.match(regexp); + if (match[1] != null) { + if ( + prov.params && + prov.params.option && + prov.params.option.options + ) { + prov.params.option.options.forEach((opt) => { + if (opt.value === match[1]) option = _(opt.description); + }); + name += " (" + option + ")"; + } else { + if (match[1] !== "") name += " (" + match[1] + ")"; + } } } - } + }); + rows.push([name, address, port, forceDnsText]); }); - rows.push([name, address, port, forceDnsText]); - }); - + } cbi_update_table(table, rows, E("em", _("There are no active instances."))); return table; diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index 4f8db0f910..9267960845 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -131,10 +131,6 @@ msgstr "" msgid "DeCloudUs DNS" msgstr "" -#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:14 -msgid "Default (Blocks ads and trackers)" -msgstr "" - #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/ch.digitale-gesellschaft.dns.json:2 msgid "Digitale Gesellschaft (CH)" msgstr "" @@ -176,7 +172,7 @@ msgid "FFMUC DNS (DE)" msgstr "" #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/ca.cira.canadianshield.json:14 -#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:22 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:14 #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.cloudflare-dns.json:14 #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.controld.freedns.json:14 #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json:14 @@ -503,6 +499,7 @@ msgid "Spain" msgstr "" #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/co.oszx.dns.json:18 +#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:18 #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.cloudflare-dns.json:18 #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.controld.freedns.json:18 #: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.opendns.doh.json:18 @@ -556,10 +553,6 @@ msgstr "" msgid "US/New York" msgstr "" -#: applications/luci-app-https-dns-proxy/root/usr/share/https-dns-proxy/providers/com.adguard.dns.json:18 -msgid "Unfiltered" -msgstr "" - #: applications/luci-app-https-dns-proxy/htdocs/luci-static/resources/view/https-dns-proxy/overview.js:245 msgid "Unknown" msgstr "" |