X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-app-adblock%2Fluasrc%2Fmodel%2Fcbi%2Fadblock%2Fblacklist_tab.lua;h=59cd1e80fa7e67d73e45755b42422d57a4013d60;hb=c87ce62711732eea323a43519da2e98f4b1a4da1;hp=de24d77fbffa8d2a4e58728d8f7cbbf0b7d6767a;hpb=dbc156f40ad5fc7294be7b78cc6eb8a59857197f;p=project%2Fluci.git
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 de24d77fb..59cd1e80f 100644
--- 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,39 +1,51 @@
--- 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."))
+ m = SimpleForm("error", nil,
+ translate("Input file not found, please check your configuration."))
+ m.reset = false
+ m.submit = false
+ return m
+end
+
+if nixio.fs.stat(adbinput).size > 524288 then
+ m = SimpleForm("error", nil,
+ translate("The file size is too large for online editing in LuCI (> 512 KB). ")
+ .. translate("Please edit this file directly in a terminal session."))
+ m.reset = false
+ m.submit = false
return m
end
m = SimpleForm("input", nil)
- m:append(Template("adblock/config_css"))
+m:append(Template("adblock/config_css"))
+m.reset = false
s = m:section(SimpleSection, nil,
- translate("This form allows you to modify the content of the adblock blacklist (" .. adbinput .. ").
")
- .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards & regex are not."))
+ translatef("This form allows you to modify the content of the adblock blacklist (%s).
", 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