Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1684 from dibdot/adblock

Browse source 
luci-app-adblock: fix function calls
This commit is contained in:
Dirk Brenken 2018-03-16 06:36:31 +01:00 committed by GitHub
commit d01ddb2928
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applications/luci-app-adblock/luasrc/controller/adblock.lua
View file

@ -3,7 +3,6 @@
module("luci.controller.adblock", package.seeall) module("luci.controller.adblock", package.seeall)
local fs = require("nixio.fs")
local util = require("luci.util") local util = require("luci.util")
local templ = require("luci.template") local templ = require("luci.template")
local i18n = require("luci.i18n") local i18n = require("luci.i18n")

2
applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
View file

@ -4,7 +4,7 @@
local fs = require("nixio.fs") local fs = require("nixio.fs")
local util = require("luci.util") local util = require("luci.util")
local uci = require("uci") 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 if not nixio.fs.access(adbinput) then
m = SimpleForm("error", nil, m = SimpleForm("error", nil,

2
applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
View file

@ -7,7 +7,7 @@ local sys = require("luci.sys")
local util = require("luci.util") local util = require("luci.util")
local dump = util.ubus("network.interface", "dump", {}) local dump = util.ubus("network.interface", "dump", {})
local json = require("luci.jsonc") 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 if not uci:get("adblock", "extra") then
m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.<br />") m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.<br />")

2
applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
View file

@ -4,7 +4,7 @@
local fs = require("nixio.fs") local fs = require("nixio.fs")
local util = require("luci.util") local util = require("luci.util")
local uci = require("uci") 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 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."))