X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-adblock%2Fluasrc%2Fmodel%2Fcbi%2Fadblock%2Fwhitelist_tab.lua;h=01d3911f6e5d447fad41dd11d29f53260f7587fb;hp=e5a05cf4cd13fe9b21e73f26eb610880ebb0c62e;hb=840f45ecc5a1d3e6db0b57ff6234e37609852734;hpb=55f251b01f22a8e5179f0f6767d1be44c745239e;ds=sidebyside diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua index e5a05cf4c..01d3911f6 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua @@ -1,22 +1,22 @@ --- Copyright 2017 Dirk Brenken (dev@brenken.org) +-- 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 fs = require("nixio.fs") +local util = require("luci.util") +local uci = require("luci.model.uci").cursor() local adbinput = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" -if not nixio.fs.access(adbinput) then +if not fs.access(adbinput) then 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 +if fs.stat(adbinput).size >= 102400 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.")) + translate("The file size is too large for online editing in LuCI (≥ 100 KB). ") + .. translate("Please edit this file directly in a terminal session.")) m.reset = false m.submit = false return m @@ -37,11 +37,11 @@ f.rows = 20 f.rmempty = true function f.cfgvalue() - return nixio.fs.readfile(adbinput) or "" + return 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") + return fs.writefile(adbinput, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n") end function s.handle(self, state, data)