luci-app-adblock: sync with adblock 3.5.4

[project/luci.git] / applications / luci-app-adblock / luasrc / model / cbi / adblock / blacklist_tab.lua

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
index 39688dc194c67433f0ae52fdb00d32020b6c3e50..b3b3f8d0eb87a3e6fb9f877be862e5d5eac36107 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
@@ -1,19 +1,19 @@
 -- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
-local fs       = require("nixio.fs")
-local util     = require("luci.util")
-local uci      = require("luci.model.uci").cursor()
-local adbinput = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist"
+local fs    = require("nixio.fs")
+local util  = require("luci.util")
+local uci   = require("luci.model.uci").cursor()
+local input = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist"
 
-if not fs.access(adbinput) then
+if not fs.access(input) then
        m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
        m.reset = false
        m.submit = false
        return m
 end
 
-if fs.stat(adbinput).size >= 102400 then
+if fs.stat(input).size >= 102400 then
        m = SimpleForm("error", nil,
                translate("The file size is too large for online editing in LuCI (≥ 100 KB). ")
                .. translate("Please edit this file directly in a terminal session."))
@@ -28,7 +28,7 @@ m.submit = translate("Save")
 m.reset = false
 
 s = m:section(SimpleSection, nil,
-       translatef("This form allows you to modify the content of the adblock blacklist (%s).<br />", adbinput)
+       translatef("This form allows you to modify the content of the adblock blacklist (%s). ", input)
        .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not."))
 
 f = s:option(TextValue, "data")
@@ -37,11 +37,15 @@ f.rows = 20
 f.rmempty = true
 
 function f.cfgvalue()
-       return fs.readfile(adbinput) or ""
+       return fs.readfile(input) or ""
 end
 
 function f.write(self, section, data)
-       return fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+       return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+end
+
+function f.remove(self, section, value)
+       return fs.writefile(input, "")
 end
 
 function s.handle(self, state, data)