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

Merge pull request #3169 from stangri/master-luci-app-simple-adblock

Browse source 
luci-app-simple-adblock: bugfix: fix invalid <br> entries
This commit is contained in:
Florian Eckert 2019-10-10 23:03:53 +02:00 committed by GitHub
commit b489aae226
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-simple-adblock/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service. LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.
LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=37 PKG_RELEASE:=38
include ../../luci.mk include ../../luci.mk

5
applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua
View file

@ -1,7 +1,6 @@
module("luci.controller.simple-adblock", package.seeall) module("luci.controller.simple-adblock", package.seeall)
function index() function index()
if not nixio.fs.access("/etc/config/simple-adblock") then if nixio.fs.access("/etc/config/simple-adblock") then
return entry({"admin", "services", "simple-adblock"}, cbi("simple-adblock"), _("Simple AdBlock"))
end end
entry({"admin", "services", "simple-adblock"}, cbi("simple-adblock"), _("Simple AdBlock"))
end end

12
applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
View file

@ -187,15 +187,15 @@ local dns_descr = translate("Pick the DNS resolution option to create the adbloc
.. translate("README") .. [[</a>]] .. " " .. translate("for details.") .. translate("README") .. [[</a>]] .. " " .. translate("for details.")
if not checkDnsmasq then if not checkDnsmasq then
dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.addnhosts</i> " .. translate("is not supported on this system.") dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.addnhosts</i> " .. translate("is not supported on this system.")
dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.conf</i> " .. translate("is not supported on this system.") dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.conf</i> " .. translate("is not supported on this system.")
dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.") dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.")
dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.servers</i> " .. translate("is not supported on this system.") dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.servers</i> " .. translate("is not supported on this system.")
elseif not checkDnsmasqIpset then elseif not checkDnsmasqIpset then
dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.") dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.")
end end
if not checkUnbound then if not checkUnbound then
dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>unbound.adb_list</i> " .. translate("is not supported on this system.") dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>unbound.adb_list</i> " .. translate("is not supported on this system.")
end end
dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), dns_descr) dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), dns_descr)