luci-app-banip: sync with banIP 0.7.0

* sync with current banIP release
* move app to client side JS
* tested with all standard themes

Signed-off-by: Dirk Brenken <dev@brenken.org>

11 files changed, 8 insertions, 988 deletions

diff --git a/applications/luci-app-banip/luasrc/controller/banip.lua b/applications/luci-app-banip/luasrc/controller/banip.lua
index 1befbe9867..7993bbfe9d 100644
--- a/applications/luci-app-banip/luasrc/controller/banip.lua
+++ b/applications/luci-app-banip/luasrc/controller/banip.lua
@@ -1,100 +1,13 @@
--- Copyright 2018-2019 Dirk Brenken (dev@brenken.org)
--- This is free software, licensed under the Apache License, Version 2.0
+-- stub lua controller for 19.07 backward compatibility
 
 module("luci.controller.banip", package.seeall)
 
-local util  = require("luci.util")
-local http  = require("luci.http")
-local i18n  = require("luci.i18n")
-local json  = require("luci.jsonc")
-local uci   = require("luci.model.uci").cursor()
-
 function index()
-	if not nixio.fs.access("/etc/config/banip") then
-		return
-	end
-
-	local e = entry({"admin", "services", "banip"}, firstchild(), _("banIP"), 40)
-	e.dependent = false
-	e.acl_depends = { "luci-app-banip" }
-
-	entry({"admin", "services", "banip", "tab_from_cbi"}, cbi("banip/overview_tab", {hideresetbtn=true, hidesavebtn=true}), _("Overview"), 10).leaf = true
-	entry({"admin", "services", "banip", "ipset"}, template("banip/ipsetview"), _("IPSet-Lookup"), 20).leaf = true
-	entry({"admin", "services", "banip", "ripe"}, template("banip/ripeview"), _("RIPE-Lookup"), 30).leaf = true
-	entry({"admin", "services", "banip", "log"}, template("banip/logview"), _("View Logfile"), 40).leaf = true
-	entry({"admin", "services", "banip", "advanced"}, firstchild(), _("Advanced"), 100)
-	entry({"admin", "services", "banip", "advanced", "blacklist"}, form("banip/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true
-	entry({"admin", "services", "banip", "advanced", "whitelist"}, form("banip/whitelist_tab"), _("Edit Whitelist"), 120).leaf = true
-	entry({"admin", "services", "banip", "advanced", "configuration"}, form("banip/configuration_tab"), _("Edit Configuration"), 130).leaf = true
-	entry({"admin", "services", "banip", "ipsetview"}, call("ipset_view"), nil).leaf = true
-	entry({"admin", "services", "banip", "ripeview"}, call("ripe_view"), nil).leaf = true
-	entry({"admin", "services", "banip", "logview"}, call("log_view"), nil).leaf = true
-	entry({"admin", "services", "banip", "status"}, call("status_update"), nil).leaf = true
-	entry({"admin", "services", "banip", "action"}, call("ban_action"), nil).leaf = true
-end
-
-function ban_action(name)
-	if name == "do_refresh" then
-		luci.sys.call("/etc/init.d/banip refresh >/dev/null 2>&1")
-	elseif name == "do_reload" then
-		luci.sys.call("/etc/init.d/banip reload >/dev/null 2>&1")
-	end
-	luci.http.prepare_content("text/plain")
-	luci.http.write("0")
-end
-
-function status_update()
-	local rt_file
-	local content
-
-	rt_file = uci:get("banip", "global", "ban_rtfile") or "/tmp/ban_runtime.json"
-
-	if nixio.fs.access(rt_file) then
-		content = json.parse(nixio.fs.readfile(rt_file) or "")
-		http.prepare_content("application/json")
-		http.write_json(content)
-	end
-end
-
-function log_view()
-	local content = util.trim(util.exec("logread -e 'banIP-' 2>/dev/null")) or ""
-
-	if content == "" then
-		content = "No banIP related logs yet!"
-	end
-	http.write(content)
-end
-
-function ipset_view(ipset, filter)
-	local content
-
-	if not (ipset or filter) then
-		return
-	end
-
-	if filter == "false" then
-		content = util.trim(util.exec("ipset -L " .. ipset .. " 2>/dev/null"))
-	else
-		content = util.trim(util.exec("ipset -L " .. ipset .. " 2>/dev/null | grep -e 'packets [1-9]\\|^[A-Z]'"))
-	end
-
-	if content == "" then
-		content = "IPSet is empty!"
-	end
-	http.write(content)
-end
-
-function ripe_view(query, input)
-	local content
-
-	if not (query or input) then
-		return
-	end
-
-	content = util.trim(util.exec("uclient-fetch --no-check-certificate -O- https://stat.ripe.net/data/" ..query.. "/data.json?resource=" ..input.. " 2>/dev/null"))
-	
-	if content == "" then
-		content = "No response!"
-	end
-	http.write(content)
+	entry({"admin", "services", "banip"}, firstchild(), _("banIP"), 60).acl_depends = { "luci-app-banip" }
+	entry({"admin", "services", "banip", "overview"}, view("banip/overview"), _("Overview"), 10)
+	entry({"admin", "services", "banip", "ipsetreport"}, view("banip/ipsetreport"), _("IPSet Report"), 20)
+	entry({"admin", "services", "banip", "blacklist"}, view("banip/blacklist"), _("Edit Blacklist"), 30)
+	entry({"admin", "services", "banip", "whitelist"}, view("banip/whitelist"), _("Edit Whitelist"), 40)
+	entry({"admin", "services", "banip", "maclist"}, view("banip/maclist"), _("Edit Maclist"), 50)
+	entry({"admin", "services", "banip", "logread"}, view("banip/logread"), _("Log View"), 60)
 end
diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua
deleted file mode 100644
index 422182f4f6..0000000000
--- a/applications/luci-app-banip/luasrc/model/cbi/banip/blacklist_tab.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- Copyright 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 input = uci:get("banip", "blacklist", "ban_src") or uci:get("banip", "blacklist", "ban_src_6") or "/etc/banip/adblock.blacklist"
-
-if not fs.access(input) then
-	m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
-	m.reset = false
-	m.submit = false
-	return m
-end
-
-if fs.stat(input).size >= 102400 then
-	m = SimpleForm("error", nil,
-		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
-end
-
-m = SimpleForm("edit", nil)
-m:append(Template("banip/banip_css"))
-m.submit = translate("Save")
-m.reset = false
-
-s = m:section(SimpleSection, nil,
-	translatef("This form allows you to modify the content of the banIP blacklist (%s).<br />", input)
-	.. translate("Please add only one IPv4 or IPv6 address per line. IP ranges in CIDR notation and comments introduced with '#' are allowed."))
-
-f = s:option(TextValue, "data")
-f.datatype = "string"
-f.rows = 20
-f.rmempty = true
-
-function f.cfgvalue()
-	return fs.readfile(input) or ""
-end
-
-function f.write(self, section, data)
-	return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
-end
-
-function f.remove(self, section, value)
-	return fs.writefile(input, "")
-end
-
-function s.handle(self, state, data)
-	return true
-end
-
-return m
diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua
deleted file mode 100644
index f90b11be01..0000000000
--- a/applications/luci-app-banip/luasrc/model/cbi/banip/configuration_tab.lua
+++ /dev/null
@@ -1,52 +0,0 @@
--- Copyright 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 input = "/etc/config/banip"
-
-if not fs.access(input) then
-	m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
-	m.reset = false
-	m.submit = false
-	return m
-end
-
-if fs.stat(input).size >= 102400 then
-	m = SimpleForm("error", nil,
-		translate("The file size is too large for online editing in LuCI (&ge; 100 KB). ")
-		.. translate("Please edit this file directly in a terminal session."))
-	m.reset = false
-	m.submit = false
-	return m
-end
-
-m = SimpleForm("edit", nil)
-m:append(Template("banip/banip_css"))
-m.submit = translate("Save")
-m.reset = false
-
-s = m:section(SimpleSection, nil,
-	translate("This form allows you to modify the content of the main banIP configuration file (/etc/config/banip)."))
-
-f = s:option(TextValue, "data")
-f.rows = 20
-f.rmempty = true
-
-function f.cfgvalue()
-	return fs.readfile(input) or ""
-end
-
-function f.write(self, section, data)
-	return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
-end
-
-function f.remove(self, section, value)
-	return fs.writefile(input, "")
-end
-
-function s.handle(self, state, data)
-	return true
-end
-
-return m
diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
deleted file mode 100644
index d418ad32af..0000000000
--- a/applications/luci-app-banip/luasrc/model/cbi/banip/overview_tab.lua
+++ /dev/null
@@ -1,215 +0,0 @@
--- Copyright 2018-2019 Dirk Brenken (dev@brenken.org)
--- This is free software, licensed under the Apache License, Version 2.0
-
-local fs   = require("nixio.fs")
-local uci  = require("luci.model.uci").cursor()
-local net  = require "luci.model.network".init()
-local util = require("luci.util")
-local dump = util.ubus("network.interface", "dump", {})
-
-m = Map("banip", translate("banIP"),
-	translate("Configuration of the banIP package to block ip adresses/subnets via IPSet. ")
-	..translatef("For further information "
-	.. "<a href=\"%s\" target=\"_blank\">"
-	.. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/banip/files/README.md"))
-
--- Main banIP Options
-
-s = m:section(NamedSection, "global", "banip")
-
-o1 = s:option(Flag, "ban_enabled", translate("Enable banIP"))
-o1.default = o1.disabled
-o1.rmempty = false
-
-o2 = s:option(Flag, "ban_automatic", translate("Automatic WAN Interface Detection"))
-o2.default = o2.enabled
-o2.rmempty = false
-
-o3 = s:option(MultiValue, "ban_iface", translate("Manual WAN Interface Selection"),
-	translate("Select your preferred interface(s) manually."))
-if dump then
-	local i, v
-	for i, v in ipairs(dump.interface) do
-		if v.interface ~= "loopback" then
-			local device = v.l3_device or v.device or "-"
-			o3:value(v.interface, " " .. v.interface .. " (" .. device .. ") ")
-		end
-	end
-end
-o3:depends("ban_automatic", 0)
-o3.widget = "checkbox"
-o3.rmempty = true
-
-o4 = s:option(Flag, "ban_realtime", translate("SSH/LuCI RT Monitor"),
-	translate("Starts a small log/banIP monitor in the background to block SSH/LuCI brute force attacks in realtime."))
-o4.enabled = "true"
-o4.default = o4.disabled
-o4.rmempty = false
-
--- Runtime Information
-
-ds = s:option(DummyValue, "_dummy")
-ds.template = "banip/runtime"
-
--- Source Table
-
-bl = m:section(TypedSection, "source", translate("IPSet Sources"))
-bl.template = "banip/sourcelist"
-
-name_4 = bl:option(Flag, "ban_src_on", translate("enable IPv4"))
-name_4.rmempty = false
-
-name_6 = bl:option(Flag, "ban_src_on_6", translate("enable IPv6"))
-name_6.rmempty = false
-
-type = bl:option(ListValue, "ban_src_ruletype", translate("SRC/DST"))
-type:value("src")
-type:value("dst")
-type:value("src+dst")
-type.default = "src"
-type.rmempty = false
-
-des = bl:option(DummyValue, "ban_src_desc", translate("Description"))
-
-cat = bl:option(DynamicList, "ban_src_cat", translate("ASN/Country"))
-cat.datatype = "uciname"
-cat.optional = true
-
--- Extra options
-
-e = m:section(NamedSection, "extra", "banip", translate("Extra Options"),
-	translate("Options for further tweaking in case the defaults are not suitable for you."))
-
-e1 = e:option(Flag, "ban_debug", translate("Verbose Debug Logging"),
-	translate("Enable verbose debug logging in case of any processing error."))
-e1.rmempty = false
-
-e2 = e:option(Flag, "ban_nice", translate("Low Priority Service"),
-	translate("Set the nice level to 'low priority' and banIP background processing will take less resources from the system. ")
-	..translate("This change requires a manual service stop/re-start to take effect."))
-e2.disabled = "0"
-e2.enabled = "10"
-e2.rmempty = false
-
-e3 = e:option(Value, "ban_backupdir", translate("Backup Directory"),
-	translate("Target directory for banIP backups. Default is '/tmp', please use preferably a non-volatile disk if available."))
-e3.datatype = "directory"
-e3.default = "/tmp"
-e3.rmempty = true
-
-e4 = e:option(Value, "ban_maxqueue", translate("Max. Download Queue"),
-	translate("Size of the download queue to handle downloads &amp; IPset processing in parallel (default '4'). ")
-	.. translate("For further performance improvements you can raise this value, e.g. '8' or '16' should be safe."))
-e4.default = 4
-e4.datatype = "range(1,32)"
-e4.rmempty = false
-
-e5 = e:option(ListValue, "ban_sshdaemon", translate("SSH Daemon"),
-	translate("Select the SSH daemon for logfile parsing, to detect break-in events."))
-e5:value("dropbear")
-e5:value("sshd")
-e5.default = "dropbear"
-e5.rmempty = true
-
-e6 = e:option(Flag, "ban_autoblacklist", translate("Local Save Blacklist Addons"),
-  translate("Blacklist auto addons are stored temporary in the IPSet and saved permanently in the local blacklist. Disable this option to prevent the local save."))
-e6.default = e6.enabled
-e6.rmempty = true
-
-e7 = e:option(Flag, "ban_autowhitelist", translate("Local Save Whitelist Addons"),
-  translate("Whitelist auto addons are stored temporary in the IPSet and saved permanently in the local whitelist. Disable this option to prevent the local save."))
-e7.default = e7.enabled
-e7.rmempty = true
-
--- Optional Extra Options
-
-e20 = e:option(ListValue, "ban_fetchutil", translate("Download Utility"),
-	translate("Select your preferred download utility."))
-e20:value("uclient-fetch")
-e20:value("wget")
-e20:value("curl")
-e20:value("aria2c")
-e20.optional = true
-
-e21 = e:option(Value, "ban_fetchparm", translate("Download Options"),
-	translate("Special options for the selected download utility, e.g. '--timeout=20 -O'."))
-e21.optional = true
-
-e22 = e:option(Value, "ban_triggerdelay", translate("Trigger Delay"),
-	translate("Additional trigger delay in seconds before banIP processing begins."))
-e22.default = 2
-e22.datatype = "range(1,60)"
-e22.optional = true
-
-e23 = e:option(ListValue, "ban_starttype", translate("Start Type"),
-	translate("Select the used start type during boot."))
-e23:value("start")
-e23:value("reload")
-e23.default = "start"
-e23.optional = true
-
-e30 = e:option(Value, "ban_wan_input_chain", translate("WAN Input Chain IPv4"))
-e30.default = "input_wan_rule"
-e30.datatype = "uciname"
-e30.optional = true
-
-e31 = e:option(Value, "ban_wan_forward_chain", translate("WAN Forward Chain IPv4"))
-e31.default = "forwarding_wan_rule"
-e31.datatype = "uciname"
-e31.optional = true
-
-e32 = e:option(Value, "ban_lan_input_chain", translate("LAN Input Chain IPv4"))
-e32.default = "input_lan_rule"
-e32.datatype = "uciname"
-e32.optional = true
-
-e33 = e:option(Value, "ban_lan_forward_chain", translate("LAN Forward Chain IPv4"))
-e33.default = "forwarding_lan_rule"
-e33.datatype = "uciname"
-e33.optional = true
-
-e34 = e:option(ListValue, "ban_target_src", translate("SRC Target IPv4"))
-e34:value("REJECT")
-e34:value("DROP")
-e34.default = "DROP"
-e34.optional = true
-
-e35 = e:option(ListValue, "ban_target_dst", translate("DST Target IPv4"))
-e35:value("REJECT")
-e35:value("DROP")
-e35.default = "REJECT"
-e35.optional = true
-
-e36 = e:option(Value, "ban_wan_input_chain_6", translate("WAN Input Chain IPv6"))
-e36.default = "input_wan_rule"
-e36.datatype = "uciname"
-e36.optional = true
-
-e37 = e:option(Value, "ban_wan_forward_chain_6", translate("WAN Forward Chain IPv6"))
-e37.default = "forwarding_wan_rule"
-e37.datatype = "uciname"
-e37.optional = true
-
-e38 = e:option(Value, "ban_lan_input_chain_6", translate("LAN Input Chain IPv6"))
-e38.default = "input_lan_rule"
-e38.datatype = "uciname"
-e38.optional = true
-
-e39 = e:option(Value, "ban_lan_forward_chain_6", translate("LAN Forward Chain IPv6"))
-e39.default = "forwarding_lan_rule"
-e39.datatype = "uciname"
-e39.optional = true
-
-e40 = e:option(ListValue, "ban_target_src_6", translate("SRC Target IPv6"))
-e40:value("REJECT")
-e40:value("DROP")
-e40.default = "DROP"
-e40.optional = true
-
-e41 = e:option(ListValue, "ban_target_dst_6", translate("DST Target IPv6"))
-e41:value("REJECT")
-e41:value("DROP")
-e41.default = "REJECT"
-e41.optional = true
-
-return m
diff --git a/applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua b/applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua
deleted file mode 100644
index c56e40f112..0000000000
--- a/applications/luci-app-banip/luasrc/model/cbi/banip/whitelist_tab.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- Copyright 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 input = uci:get("banip", "whitelist", "ban_src") or uci:get("banip", "whitelist", "ban_src_6") or "/etc/banip/adblock.whitelist"
-
-if not fs.access(input) then
-	m = SimpleForm("error", nil, translate("Input file not found, please check your configuration."))
-	m.reset = false
-	m.submit = false
-	return m
-end
-
-if fs.stat(input).size >= 102400 then
-	m = SimpleForm("error", nil,
-		translate("The file size is too large for online editing in LuCI (&ge; 100 KB). ")
-		.. translate("Please edit this file directly in a terminal session."))
-	m.reset = false
-	m.submit = false
-	return m
-end
-
-m = SimpleForm("edit", nil)
-m:append(Template("banip/banip_css"))
-m.submit = translate("Save")
-m.reset = false
-
-s = m:section(SimpleSection, nil,
-	translatef("This form allows you to modify the content of the banIP whitelist (%s).<br />", input)
-	.. translate("Please add only one IPv4 or IPv6 address per line. IP ranges in CIDR notation and comments introduced with '#' are allowed."))
-
-f = s:option(TextValue, "data")
-f.datatype = "string"
-f.rows = 20
-f.rmempty = true
-
-function f.cfgvalue()
-	return fs.readfile(input) or ""
-end
-
-function f.write(self, section, data)
-	return fs.writefile(input, "\n" .. util.trim(data:gsub("\r\n", "\n")) .. "\n")
-end
-
-function f.remove(self, section, value)
-	return fs.writefile(input, "")
-end
-
-function s.handle(self, state, data)
-	return true
-end
-
-return m
diff --git a/applications/luci-app-banip/luasrc/view/banip/banip_css.htm b/applications/luci-app-banip/luasrc/view/banip/banip_css.htm
deleted file mode 100644
index 2fd4109e90..0000000000
--- a/applications/luci-app-banip/luasrc/view/banip/banip_css.htm
+++ /dev/null
@@ -1,95 +0,0 @@
-<style type="text/css">
-	textarea
-	{
-		width: 100% !important;
-		height: 450px !important;
-		border: 1px solid #cccccc;
-		padding: 5px;
-		font-size: 12px;
-		font-family: monospace;
-		resize: none;
-		white-space: pre;
-		overflow-wrap: normal;
-		overflow-x: scroll;
-	}
-
-	select[readonly],
-	textarea[readonly]
-	{
-		width: 100% !important;
-		height: 450px !important;
-		border: 1px solid #cccccc;
-		padding: 5px;
-		font-size: 12px;
-		font-family: monospace;
-		resize: none;
-		pointer-events: auto;
-		cursor: auto;
-	}
-
-	.table.cbi-section-table .th,
-	.table.cbi-section-table .td,
-	.cbi-section-table-cell,
-	.cbi-section-table-row,
-	.tr[data-title]::before
-	{
-		text-align: left !important;
-		vertical-align: top;
-		margin-left: 0px;
-		padding-left: 2px;
-	}
-
-	.table.cbi-section-table .th
-	{
-		white-space: nowrap;
-	}
-
-	.cbi-section-table-row > .cbi-value-field .cbi-input-select,
-	.table.cbi-section-table select
-	{
-		width: 70px;
-	}
-
-	.item,
-	.add-item
-	{
-		white-space: nowrap;
-		width: 8.2em;
-	}
-
-	.cbi-input-checkbox
-	{
-		height: 1em;
-	}
-
-	.cbi-button
-	{
-		-webkit-appearance: menulist;
-	}
-
-	.runtime
-	{
-		color: #37c;
-		font-weight: bold;
-		display: inline-block;
-		width: 100%;
-		padding-top: 0.5rem;
-	}
-
-	.ripe_desc
-	{
-		font-style: italic;
-		display: inline-block;
-		width: 100%;
-		height: 20px;
-		margin: 2px 2px;
-	}
-
-	.button_running
-	{
-		display: inline-block;
-		width: 16px;
-		height: 16px;
-		margin: 0 5px;
-	}
-</style>
diff --git a/applications/luci-app-banip/luasrc/view/banip/ipsetview.htm b/applications/luci-app-banip/luasrc/view/banip/ipsetview.htm
deleted file mode 100644
index 22c1312a8f..0000000000
--- a/applications/luci-app-banip/luasrc/view/banip/ipsetview.htm
+++ /dev/null
@@ -1,67 +0,0 @@
-<%#
-Copyright 2018 Dirk Brenken (dev@brenken.org)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%-
-	local util   = require("luci.util")
-	local ipsets = util.split(util.trim(util.exec("ipset -n -L 2>/dev/null | sort")), "\n", nil, true) or {}
--%>
-
-<%+header%>
-<%+banip/banip_css%>
-
-<script type="text/javascript">
-//<![CDATA[
-	function ipset_view()
-	{
-		var div_ipsets = document.getElementById("div_ipsets");
-		var ipset      = div_ipsets.querySelector("#s_ipsets").value;
-		var filter     = document.getElementById("checkbox_filter").checked;
-		var view       = document.getElementById("view_id");
-
-		if (!ipset)
-		{
-			return;
-		}
-		view.value = "<%:Loading ...%>";
-
-	new XHR().get('<%=luci.dispatcher.build_url("admin", "services", "banip")%>/ipsetview/' + ipset + "/" + filter, null,
-		function(x)
-		{
-		if (!x)
-			{
-				view.value = "<%:No response!%>";
-				return;
-			}
-			view.value = x.responseText;
-		});
-	}
-//]]>
-</script>
-
-<div class="cbi-map">
-	<div class="cbi-section">
-		<div class="cbi-section-descr"><%:Check the current available IPSets.%></div>
-		<div class="cbi-section-node">
-			<div class="table cbi-section-table">
-				<div class="tr cbi-section-table-row">
-					<div class="td left">
-						<input class="cbi-input-checkbox" data-update="click change" type="checkbox" id="checkbox_filter" name="checkbox_filter" value="1" checked="checked" />
-						<label for="checkbox_filter"><%_Show only set member with packet counter &gt; 0%></label>
-					</div>
-				</div>
-				<div class="tr cbi-section-table-row" id="div_ipsets">
-					<div class="td left">
-						<select id="s_ipsets" class="cbi-input-select cbi-button" style="width:15em">
-							<%- for _, z in ipairs(ipsets) do -%><option value="<%=z%>"><%=z%></option><%- end -%>
-						</select>
-						<input type="button" id="bt_load" value="<%:Load%>" onclick="ipset_view()" class="cbi-button cbi-button-add" />
-					</div>
-				</div>
-			</div>
-		</div>
-		<textarea id="view_id" readonly="readonly" wrap="off" value=""></textarea>
-	</div>
-</div>
-<%+footer%>
diff --git a/applications/luci-app-banip/luasrc/view/banip/logview.htm b/applications/luci-app-banip/luasrc/view/banip/logview.htm
deleted file mode 100644
index 86f1ea64fa..0000000000
--- a/applications/luci-app-banip/luasrc/view/banip/logview.htm
+++ /dev/null
@@ -1,36 +0,0 @@
-<%#
-Copyright 2018 Dirk Brenken (dev@brenken.org)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%+header%>
-<%+banip/banip_css%>
-
-<script type="text/javascript">
-//<![CDATA[
-	function log_update()
-	{
-		XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "banip", "logview")%>', null,
-		function(x)
-		{
-			if (!x)
-			{
-				return;
-			}
-			var view       = document.getElementById("view_id");
-			view.value     = x.responseText;
-			view.scrollTop = view.scrollHeight;
-		});
-	}
-	window.onload = log_update();
-//]]>
-</script>
-
-<div class="cbi-map">
-	<div class="cbi-section">
-		<div class="cbi-section-descr"><%:The syslog output, pre-filtered for banIP related messages only.%></div>
-		<textarea id="view_id" readonly="readonly" wrap="off" value=""></textarea>
-	</div>
-</div>
-
-<%+footer%>
diff --git a/applications/luci-app-banip/luasrc/view/banip/ripeview.htm b/applications/luci-app-banip/luasrc/view/banip/ripeview.htm
deleted file mode 100644
index 5d26ce95f1..0000000000
--- a/applications/luci-app-banip/luasrc/view/banip/ripeview.htm
+++ /dev/null
@@ -1,107 +0,0 @@
-<%#
-Copyright 2018 Dirk Brenken (dev@brenken.org)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%+header%>
-<%+banip/banip_css%>
-
-<script type="text/javascript">
-//<![CDATA[
-	function ripe_desc()
-	{
-		var div_ripe = document.getElementById("div_ripe");
-		var query    = div_ripe.querySelector("#s_ripe").value;
-		var output   = document.getElementById("ripe_desc");
-		
-		switch (query) {
-			case "geoloc":
-				output.innerHTML = "<%:This data call returns geolocation information for the given IP space, or for announced IP prefixes in the case of ASNs.%>";
-			break;
-			case "as-overview":
-				output.innerHTML = "<%:This data call shows general informations about an ASN like its announcement status and the name of its holder according to the WHOIS service.%>";
-			break;
-			case "announced-prefixes":
-				output.innerHTML = "<%:This data call returns all announced prefixes for a given ASN.%>";
-			break;
-			case "network-info":
-				output.innerHTML = "<%:This data call returns the containing prefix and announcing ASN of a given IP address.%>";
-			break;
-			case "country-resource-list":
-				output.innerHTML = "<%:This data call lists the Internet resources associated with a country, including ASNs, IPv4 ranges and IPv4/6 CIDR prefixes.%>";
-			break;
-			case "whois":
-				output.innerHTML = "<%:This data call returns whois information from the relevant Regional Internet Registry and Routing Registry.%>";
-			break;
-			case "dns-chain":
-				output.innerHTML = "<%:This data call returns the recursive chain of DNS forward (A/AAAA/CNAME) and reverse (PTR) records starting form either a hostname or an IP address.%>";
-			break;
-			case "iana-registry-info":
-				output.innerHTML = "<%:This data call gives access to various data sources maintained by IANA.%>";
-			break;
-			default:
-				output.innerHTML = "";
-		}
-	}
-
-	function ripe_view()
-	{
-		var div_ripe = document.getElementById("div_ripe");
-		var query    = div_ripe.querySelector("#s_ripe").value;
-		var input    = document.getElementById("ripe_input");
-		var view     = document.getElementById("view_id");
-
-		if (!input.value)
-		{
-			return;
-		}
-		view.value = "<%:Loading ...%>";
-
-		new XHR().get('<%=luci.dispatcher.build_url("admin", "services", "banip")%>/ripeview/' + query + "/" + input.value, null,
-		function(x)
-		{
-		if (!x)
-			{
-				view.value = "<%:No response!%>";
-				return;
-			}
-			view.value = x.responseText;
-		});
-	}
-	window.onload = ripe_desc;
-//]]>
-</script>
-
-<div class="cbi-map">
-	<div class="cbi-section">
-		<div class="cbi-section-descr"><%_The RIPEstat Data API is the public data interface provided by RIPE NCC, for details look <a href="https://stat.ripe.net/docs/data_api" target="_blank" rel="noopener noreferrer">here</a>.%></div>
-		<div class="cbi-section-node">
-			<div class="table cbi-section-table">
-				<div class="tr cbi-section-table-row">
-					<div class="td left">
-						<input class="cbi-input-text" style="width:20em" type="text" id="ripe_input" placeholder="<%:Enter IP/CIDR/ASN/ISO%>" value="" />
-					</div>
-				</div>
-				<div class="tr cbi-section-table-row" id="div_ripe">
-					<div class="td left">
-						<select id="s_ripe" class="cbi-input-select cbi-button" style="width:15em" onchange="ripe_desc()">
-							<option value="geoloc" selected="selected"><%:Geo Location%></option>
-							<option value="as-overview"><%:ASN Overview%></option>
-							<option value="announced-prefixes"><%:ASN Prefixes%></option>
-							<option value="network-info"><%:IP/ASN Mapping%></option>
-							<option value="country-resource-list"><%:Country Resources%></option>
-							<option value="whois"><%:Whois Information%></option>
-							<option value="dns-chain"><%:DNS Chain%></option>
-							<option value="iana-registry-info"><%:IANA Information%></option>
-						</select>
-						<input type="button" id="bt_load" value="<%:Load%>" onclick="ripe_view()" class="cbi-button cbi-button-add" /><br /><br />
-						<span class="ripe_desc" id="ripe_desc"></span>
-					</div>
-				</div>
-			</div>
-		</div>
-		<textarea id="view_id" readonly="readonly" wrap="off" value=""></textarea>
-	</div>
-</div>
-
-<%+footer%>
\ No newline at end of file
diff --git a/applications/luci-app-banip/luasrc/view/banip/runtime.htm b/applications/luci-app-banip/luasrc/view/banip/runtime.htm
deleted file mode 100644
index f96b23dc80..0000000000
--- a/applications/luci-app-banip/luasrc/view/banip/runtime.htm
+++ /dev/null
@@ -1,164 +0,0 @@
-<%#
-Copyright 2018-2019 Dirk Brenken (dev@brenken.org)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%+banip/banip_css%>
-<script type="text/javascript">
-//<![CDATA[
-	function status_update(json)
-	{
-			var btn1         = document.getElementById("btn1");
-			var btn1_running = document.getElementById("btn1_running");
-			var btn2         = document.getElementById("btn2");
-			var btn2_running = document.getElementById("btn2_running");
-			var view         = document.getElementById("value_1");
-			var input        = json.data.status;
-
-			btn1.value = "<%:Refresh%>";
-			btn1.name  = "do_refresh";
-
-			btn2.value = "<%:Reload%>";
-			btn2.name  = "do_reload";
-			view.innerHTML = input || "-";
-			if (input != "running")
-			{
-				btn1.disabled = false;
-				running(btn1_running, 0);
-				btn2.disabled = false;
-				running(btn2_running, 0);
-			}
-			view = document.getElementById("value_2");
-			input = json.data.version;
-			view.innerHTML = input || "-";
-			view = document.getElementById("value_3");
-			input = json.data.util_info;
-			view.innerHTML = input || "-";
-			view = document.getElementById("value_4");
-			input = json.data.ipset_info;
-			view.innerHTML = input || "-";
-			view = document.getElementById("value_5");
-			input = json.data.backup_dir;
-			view.innerHTML = input || "-";
-			view = document.getElementById("value_6");
-			input = json.data.last_run;
-			view.innerHTML = input || "-";
-	}
-
-function btn_action(action)
-	{
-		var btn1 = document.getElementById("btn1");
-		var btn1_running = document.getElementById("btn1_running");
-		var btn2 = document.getElementById("btn2");
-		var btn2_running = document.getElementById("btn2_running");
-
-		if (action.name === "do_refresh")
-		{
-			btn1.disabled = true;
-			btn2.disabled = true;
-			running(btn1_running, 1);
-		}
-		else if (action.name === "do_reload")
-		{
-			btn1.disabled = true;
-			btn2.disabled = true;
-			running(btn2_running, 1);
-		}
-		new XHR.get('<%=luci.dispatcher.build_url("admin", "services", "banip")%>/action/' + action.name, null,
-		function(x)
-		{
-			if (!x)
-			{
-				return;
-			}
-		});
-	}
-
-	function running(element, state)
-	{
-		if (state === 1)
-		{
-			var running_html = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
-			element.innerHTML = running_html;
-		}
-		else
-		{
-			element.innerHTML = '';
-		}
-	}
-
-	XHR.get('<%=luci.dispatcher.build_url("admin", "services", "banip", "status")%>', null,
-	function(x, json_info)
-	{
-		if (!x || !json_info)
-		{
-			return;
-		}
-		status_update(json_info)
-	});
-
-	XHR.poll(-1, '<%=luci.dispatcher.build_url("admin", "services", "banip", "status")%>', null,
-	function(x, json_info)
-	{
-		if (!x || !json_info)
-		{
-			return;
-		}
-		status_update(json_info)
-	});
-//]]>
-</script>
-
-<h3><%:Runtime Information%></h3>
-<div class="cbi-value" id="status_1">
-	<label class="cbi-value-title" for="status_1"><%:banIP Status%></label>
-	<div class="cbi-value-field">
-		<span class="runtime" id="value_1">-</span>
-	</div>
-</div>
-<div class="cbi-value" id="status_2">
-	<label class="cbi-value-title" for="status_2"><%:banIP Version%></label>
-	<div class="cbi-value-field">
-		<span class="runtime" id="value_2">-</span>
-	</div>
-</div>
-<div class="cbi-value" id="status_3">
-	<label class="cbi-value-title" for="status_3"><%:Download Utility, RT Monitor%></label>
-	<div class="cbi-value-field">
-		<span class="runtime" id="value_3">-</span>
-	</div>
-</div>
-<div class="cbi-value" id="status_4">
-	<label class="cbi-value-title" for="status_4"><%:IPSet Information%></label>
-	<div class="cbi-value-field">
-		<span class="runtime" id="value_4">-</span>
-	</div>
-</div>
-<div class="cbi-value" id="status_5">
-	<label class="cbi-value-title" for="status_5"><%:Backup Directory%></label>
-	<div class="cbi-value-field">
-		<span class="runtime" id="value_5">-</span>
-	</div>
-</div>
-<div class="cbi-value" id="status_6">
-	<label class="cbi-value-title" for="status_6"><%:Last Run%></label>
-	<div class="cbi-value-field">
-		<span class="runtime" id="value_6">-</span>
-	</div>
-</div>
-<hr />
-<div class="cbi-value" id="button_1">
-	<label class="cbi-value-title" for="button_1"><%:Refresh IPSets%></label>
-	<div class="cbi-value-field">
-		<input class="cbi-button cbi-button-apply" id="btn1" type="button" name="do_refresh" value="<%:Refresh%>" onclick="btn_action(this)" />
-		<span id="btn1_running" class="btn_running"></span>
-	</div>
-</div>
-<div class="cbi-value" id="button_2">
-	<label class="cbi-value-title" for="button_2"><%:Reload IPSet Sources%></label>
-	<div class="cbi-value-field">
-		<input class="cbi-button cbi-button-reset" id="btn2" type="button" name="do_reload" value="<%:Reload%>" onclick="btn_action(this)" />
-		<span id="btn2_running" class="btn_running"></span>
-	</div>
-</div>
-
diff --git a/applications/luci-app-banip/luasrc/view/banip/sourcelist.htm b/applications/luci-app-banip/luasrc/view/banip/sourcelist.htm
deleted file mode 100644
index 12240e5ae4..0000000000
--- a/applications/luci-app-banip/luasrc/view/banip/sourcelist.htm
+++ /dev/null
@@ -1,47 +0,0 @@
-<%#
-Copyright 2018 Dirk Brenken (dev@brenken.org)
-This is free software, licensed under the Apache License, Version 2.0
--%>
-
-<%-
-local anonclass  = (not self.anonymous or self.sectiontitle) and "named" or "anonymous"
--%>
-
-<%+banip/banip_css%>
-
-<div class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
-	<% if self.title then -%>
-		<h3><%=self.title%></h3>
-	<%- end %>
-	<div class="cbi-section-descr"><%=self.description%></div>
-	<div class="cbi-section-node">
-		<div class="table cbi-section-table">
-			<div class="tr cbi-section-table-titles <%=anonclass%>">
-			<%- for i, k in pairs(self.children) do -%>
-				<div class="th cbi-section-table-cell">
-					<%-=k.title-%>
-				</div>
-			<%- end -%>
-			</div>
-			<%- local section, scope, isempty = true
-				for i, k in ipairs(self:cfgsections()) do
-					section = k
-					local sectionname  = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k)
-					local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname, true)
-					isempty = false
-					scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" }
-			-%>
-			<div class="tr cbi-section-table-row" id="cbi-<%=self.config%>-<%=section%>"<%=sectiontitle%>>
-				<%-
-					for k, node in ipairs(self.children) do
-						node:render(section, scope or {})
-					end
-					if not scope.cbid:match("ban_src_cat") then
-				-%>
-					<div class="td cbi-value-field">&#160;</div>
-				<%- end -%>
-			</div>
-			<%- end -%>
-		</div>
-	</div>
-</div>