diff options
| author | Dirk Brenken <dev@brenken.org> | 2018-03-15 15:39:30 +0100 |
|---|---|---|
| committer | Dirk Brenken <dev@brenken.org> | 2018-03-15 20:25:30 +0100 |
| commit | b2cc7bf276e63b50b636b6d6f60bc2fec1aa2d26 (patch) | |
| tree | d9887444797a9587a07633ca925c97a8adbe4f11 /applications | |
| parent | b1c5a4c075bd501475410ed351e529d34fc435cb (diff) | |
luci-app-adblock: fix function calls
* fix function calls that have an implicit extra parameter self,
pre-requisite for PR #1681
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'applications')
4 files changed, 3 insertions, 4 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index d4368e789..700f187b3 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -3,7 +3,6 @@ module("luci.controller.adblock", package.seeall) -local fs = require("nixio.fs") local util = require("luci.util") local templ = require("luci.template") local i18n = require("luci.i18n") 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 ef70100e4..8526a4b5e 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 @@ -4,7 +4,7 @@ local fs = require("nixio.fs") local util = require("luci.util") local uci = require("uci") -local adbinput = uci.get("adblock", "blacklist", "adb_src" or "/etc/adblock/adblock.blacklist") +local adbinput = uci:get("adblock", "blacklist", "adb_src") or "/etc/adblock/adblock.blacklist" if not nixio.fs.access(adbinput) then m = SimpleForm("error", nil, 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 aef0a9fa9..3786c7a4e 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 @@ -7,7 +7,7 @@ local sys = require("luci.sys") local util = require("luci.util") local dump = util.ubus("network.interface", "dump", {}) local json = require("luci.jsonc") -local adbinput = uci.get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" +local adbinput = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" if not uci:get("adblock", "extra") then m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.<br />") 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 a3659eb46..df8b34f8e 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 @@ -4,7 +4,7 @@ local fs = require("nixio.fs") local util = require("luci.util") local uci = require("uci") -local adbinput = uci.get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" +local adbinput = uci:get("adblock", "global", "adb_whitelist") or "/etc/adblock/adblock.whitelist" if not nixio.fs.access(adbinput) then m = SimpleForm("error", nil, translate("Input file not found, please check your configuration.")) |