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

Merge pull request #1386 from dibdot/dnscrypt-proxy

Browse source 
luci-app-dnscrypt-proxy: fix resolver selection
This commit is contained in:
Hannu Nyman 2017-10-08 10:36:18 +03:00 committed by GitHub
commit 2d011a5e97
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,8 +33,19 @@ for line in io.lines(res_input) do
local name, local name,
location, location,
dnssec, 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 } res_list[#res_list + 1] = { name = name, location = location, dnssec = dnssec, nolog = nolog }
end
end end
m = Map("dnscrypt-proxy", translate("DNSCrypt-Proxy"), m = Map("dnscrypt-proxy", translate("DNSCrypt-Proxy"),
@ -174,7 +185,7 @@ i3.datatype = "hostname"
i3.widget = "select" i3.widget = "select"
local i, v local i, v
for i, v in ipairs(res_list) do 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 .. ")") i3:value(v.name, v.name .. " (" .. v.location .. "/" .. v.dnssec .. "/" .. v.nolog .. ")")
end end
end end