Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-dnscrypt-proxy: fix resolver selection

Browse source 
* fix regex for resolver selection,
bring back 'cs-*' and 'securedns' entries

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2017-10-08 09:31:06 +02:00
parent f2d8f1f4cd
commit 1f79a51aa9
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
applications/luci-app-dnscrypt-proxy/luasrc/model/cbi/dnscrypt-proxy/overview_tab.lua
View file

@ -33,9 +33,20 @@ for line in io.lines(res_input) do
local name,
location,
dnssec,
nolog = line:match("^([^,]+),.-,\".-\",\"(.-)\",.-,[0-9],([yesno]+),([yesno]+)")
nolog = line:match("^([^,]+),.-,\".-\",\"*(.-)\"*,.-,[0-9],\"*([yesno]+)\"*,\"*([yesno]+)\"*,.*")
if name ~= "" and name ~= "Name" then
if location == "" then
location = "-"
end
if dnssec == "" then
dnssec = "-"
end
if nolog == "" then
nolog = "-"
end
res_list[#res_list + 1] = { name = name, location = location, dnssec = dnssec, nolog = nolog }
end
end
m = Map("dnscrypt-proxy", translate("DNSCrypt-Proxy"),
translate("Configuration of the DNSCrypt-Proxy package. ")
@ -174,7 +185,7 @@ i3.datatype = "hostname"
i3.widget = "select"
local i, v
for i, v in ipairs(res_list) do
if v.name and v.location and v.dnssec and v.nolog and v.name ~= "Name" then
if v.name then
i3:value(v.name, v.name .. " (" .. v.location .. "/" .. v.dnssec .. "/" .. v.nolog .. ")")
end
end