luci-app-adblock: sync with adblock 2.6.0

[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 efe40e0..7945aa1 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,11 +1,10 @@
--- Copyright 2016 Hannu Nyman
 -- Copyright 2017 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("uci")
-local adbinput = uci.get("adblock", "blacklist", "adb_src")
+local adbinput = uci.get("adblock", "blacklist", "adb_src" or "/etc/adblock/adblock.blacklist")
 
 if not nixio.fs.access(adbinput) then
        m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
@@ -13,27 +12,27 @@ if not nixio.fs.access(adbinput) then
 end
 
 m = SimpleForm("input", nil)
-       m:append(Template("adblock/config_css"))
+m:append(Template("adblock/config_css"))
 
 s = m:section(SimpleSection, nil,
        translatef("This form allows you to modify the content of the adblock blacklist (%s).<br />", adbinput)
        .. 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")
-       f.rmempty = true
-       f.datatype = "string"
-       f.rows = 20
+f.datatype = "string"
+f.rows = 20
+f.rmempty = true
 
-       function f.cfgvalue()
-               return nixio.fs.readfile(adbinput) or ""
-       end
+function f.cfgvalue()
+       return nixio.fs.readfile(adbinput) or ""
+end
 
-       function f.write(self, section, data)
-               return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
-       end
+function f.write(self, section, data)
+       return nixio.fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
+end
 
-       function s.handle(self, state, data)
-               return true
-       end
+function s.handle(self, state, data)
+       return true
+end
 
 return m