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

Merge pull request #1523 from dibdot/adblock

Browse source 
luci-app-adblock: sync with adblock 3.4.3
This commit is contained in:
Hannu Nyman 2018-01-10 23:45:04 +02:00 committed by GitHub
commit 5d0f0b997d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
View file

@ -79,22 +79,34 @@ o2:value("unbound", "unbound (/var/lib/unbound)")
o2:value("named", "named (/var/lib/bind)") o2:value("named", "named (/var/lib/bind)")
o2:value("kresd", "kresd (/etc/kresd)") o2:value("kresd", "kresd (/etc/kresd)")
o2:value("dnscrypt-proxy","dnscrypt-proxy (/tmp)") o2:value("dnscrypt-proxy","dnscrypt-proxy (/tmp)")
o2.default = "dnsmasq (/tmp)"
o2.rmempty = false o2.rmempty = false
o3 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"), o3 = s:option(ListValue, "adb_fetchutil", translate("Download Utility"),
translate("List of supported and fully pre-configured download utilities."))
o3:value("uclient-fetch")
o3:value("wget")
o3:value("curl")
o3:value("aria2c")
o3:value("wget-nossl", "wget-nossl (noSSL)")
o3:value("busybox", "wget-busybox (noSSL)")
o3.default = "uclient-fetch"
o3.rmempty = false
o4 = s:option(ListValue, "adb_trigger", translate("Startup Trigger"),
translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface.<br />") translate("List of available network interfaces. Usually the startup will be triggered by the 'wan' interface.<br />")
.. translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface.")) .. translate("Choose 'none' to disable automatic startups, 'timed' to use a classic timeout (default 30 sec.) or select another trigger interface."))
o3:value("none") o4:value("none")
o3:value("timed") o4:value("timed")
if dump then if dump then
local i, v local i, v
for i, v in ipairs(dump.interface) do for i, v in ipairs(dump.interface) do
if v.interface ~= "loopback" then if v.interface ~= "loopback" then
o3:value(v.interface) o4:value(v.interface)
end end
end end
end end
o3.rmempty = false o4.rmempty = false
-- Runtime information -- Runtime information
@ -111,6 +123,8 @@ else
dv1.value = translate("disabled") dv1.value = translate("disabled")
elseif status == "paused" then elseif status == "paused" then
dv1.value = translate("paused") dv1.value = translate("paused")
elseif status == "running" then
dv1.value = translate("running")
else else
dv1.value = translate("enabled") dv1.value = translate("enabled")
end end
@ -125,7 +139,7 @@ else
end end
dv3 = ds:option(DummyValue, "", translate("Download Utility (SSL Library)"), dv3 = ds:option(DummyValue, "", translate("Download Utility (SSL Library)"),
translate("For SSL protected blocklist sources you need a suitable SSL library, e.g. 'libustream-ssl' or the wget 'built-in'.")) translate("For SSL protected blocklist sources you need a suitable SSL library, e.g. 'libustream-ssl' or 'built-in'."))
dv3.template = "adblock/runtime" dv3.template = "adblock/runtime"
if parse == nil then if parse == nil then
dv3.value = translate("n/a") dv3.value = translate("n/a")

4
applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
View file

@ -1,10 +1,10 @@
<%# <%#
Copyright 2017 Dirk Brenken (dev@brenken.org) Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
This is free software, licensed under the Apache License, Version 2.0 This is free software, licensed under the Apache License, Version 2.0
-%> -%>
<%+cbi/valueheader%> <%+cbi/valueheader%>
<input name="runtime" id="runtime" type="text" class="cbi-input-text" style="border:none;box-shadow:none;background:transparent;color:#0069d6;" value="<%=self:cfgvalue(section)%>" disabled="disabled" /> <input name="runtime" id="runtime" type="text" class="cbi-input-text" style="outline:none;border:none;box-shadow:none;background:transparent;color:#0069d6;font-weight:bold;line-height:30px;height:30px;" value="<%=self:cfgvalue(section)%>" disabled="disabled" />
<%+cbi/valuefooter%> <%+cbi/valuefooter%>