X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-adblock%2Fluasrc%2Fmodel%2Fcbi%2Fadblock%2Foverview_tab.lua;h=38086c9eb42b3e181ed133cf91573d0fcb930a26;hp=362ae79bf6dffa5a4e8d7d7693bd3aba85035f11;hb=bd482566f479bdc62e85964a0ec9af4a34294860;hpb=fa6dc645e8ef968ba7cf5de9447e295bc8855e15
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 362ae79bf..38086c9eb 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -12,11 +12,20 @@ local dnsFile2 = sys.exec("find '/var/lib/unbound/.adb_hidden' -maxdepth 1 -type
m = Map("adblock", translate("Adblock"),
translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ")
- .. translate("For further information ")
- .. [[]]
- .. translate("see online documentation")
- .. [[]]
- .. translate("."))
+ .. translatef("For further information "
+ .. ""
+ .. "see online documentation", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md"))
+
+function m.on_after_commit(self)
+ function e3.validate(self, value)
+ if value == "0" then
+ luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
+ else
+ luci.sys.call("/etc/init.d/adblock start >/dev/null 2>&1")
+ end
+ end
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
+end
-- Main adblock options
@@ -33,6 +42,7 @@ if dnsFile1 ~= "" or dnsFile2 ~= "" then
btn.disabled = false
function btn.write()
luci.sys.call("/etc/init.d/adblock resume >/dev/null 2>&1")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
end
else
btn.inputtitle = translate("Suspend adblock")
@@ -40,6 +50,7 @@ else
btn.disabled = false
function btn.write()
luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1")
+ luci.http.redirect(luci.dispatcher.build_url("admin", "services", "adblock"))
end
end
@@ -50,7 +61,7 @@ o2.rmempty = true
o3 = s:option(Value, "adb_triggerdelay", translate("Trigger delay"),
translate("Additional trigger delay in seconds before adblock processing begins."))
-o3.default = 1
+o3.default = 2
o3.datatype = "range(1,90)"
o3.rmempty = false
@@ -137,16 +148,33 @@ end
des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
--- Backup options
+-- Extra options
+
+e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
+ translate("Options for further tweaking in case the defaults are not suitable for you."))
+
+e1 = e:option(Flag, "adb_forcedns", translate("Force local DNS"),
+ translate("Redirect all DNS queries to the local resolver."))
+e1.default = e1.disabled
+e1.rmempty = false
+
+e2 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
+ translate("Enable memory intense overall sort / duplicate removal on low memory devices (< 64 MB RAM)"))
+e2.default = e2.disabled
+e2.rmempty = false
-s = m:section(NamedSection, "global", "adblock", translate("Backup options"))
+e3 = e:option(Flag, "adb_manmode", translate("Manual mode"),
+ translate("Do not automatically update blocklists during startup, use blocklist backups instead."))
+e3.default = e3.disabled
+e3.rmempty = false
-o5 = s:option(Flag, "adb_backup", translate("Enable blocklist backup"))
-o5.default = o5.disabled
-o5.rmempty = false
+e4 = e:option(Flag, "adb_backup", translate("Enable blocklist backup"),
+ translate("Create compressed blocklist backups, they will be used in case of download errors or during startup in manual mode."))
+e4.default = e4.disabled
+e4.rmempty = false
-o6 = s:option(Value, "adb_backupdir", translate("Backup directory"))
-o6.datatype = "directory"
-o6.rmempty = false
+e5 = e:option(Value, "adb_backupdir", translate("Backup directory"))
+e5.datatype = "directory"
+e5.rmempty = false
return m