treewide: move server side CBI support to luci-compat

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

35 files changed, 0 insertions, 4028 deletions

diff --git a/modules/luci-base/luasrc/cbi.lua b/modules/luci-base/luasrc/cbi.lua
deleted file mode 100644
index 450e41391..000000000
--- a/modules/luci-base/luasrc/cbi.lua
+++ /dev/null
@@ -1,1977 +0,0 @@
--- Copyright 2008 Steven Barth <steven@midlink.org>
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.cbi", package.seeall)
-
-require("luci.template")
-local util = require("luci.util")
-require("luci.http")
-
-
---local event      = require "luci.sys.event"
-local fs         = require("nixio.fs")
-local uci        = require("luci.model.uci")
-local datatypes  = require("luci.cbi.datatypes")
-local dispatcher = require("luci.dispatcher")
-local class      = util.class
-local instanceof = util.instanceof
-
-FORM_NODATA  =  0
-FORM_PROCEED =  0
-FORM_VALID   =  1
-FORM_DONE	 =  1
-FORM_INVALID = -1
-FORM_CHANGED =  2
-FORM_SKIP    =  4
-
-AUTO = true
-
-CREATE_PREFIX = "cbi.cts."
-REMOVE_PREFIX = "cbi.rts."
-RESORT_PREFIX = "cbi.sts."
-FEXIST_PREFIX = "cbi.cbe."
-
--- Loads a CBI map from given file, creating an environment and returns it
-function load(cbimap, ...)
-	local fs   = require "nixio.fs"
-	local i18n = require "luci.i18n"
-	require("luci.config")
-	require("luci.util")
-
-	local upldir = "/etc/luci-uploads/"
-	local cbidir = luci.util.libpath() .. "/model/cbi/"
-	local func, err
-
-	if fs.access(cbidir..cbimap..".lua") then
-		func, err = loadfile(cbidir..cbimap..".lua")
-	elseif fs.access(cbimap) then
-		func, err = loadfile(cbimap)
-	else
-		func, err = nil, "Model '" .. cbimap .. "' not found!"
-	end
-
-	assert(func, err)
-
-	local env = {
-		translate=i18n.translate,
-		translatef=i18n.translatef,
-	 	arg={...}
-	}
-
-	setfenv(func, setmetatable(env, {__index =
-		function(tbl, key)
-			return rawget(tbl, key) or _M[key] or _G[key]
-		end}))
-
-	local maps       = { func() }
-	local uploads    = { }
-	local has_upload = false
-
-	for i, map in ipairs(maps) do
-		if not instanceof(map, Node) then
-			error("CBI map returns no valid map object!")
-			return nil
-		else
-			map:prepare()
-			if map.upload_fields then
-				has_upload = true
-				for _, field in ipairs(map.upload_fields) do
-					uploads[
-						field.config .. '.' ..
-						(field.section.sectiontype or '1') .. '.' ..
-						field.option
-					] = true
-				end
-			end
-		end
-	end
-
-	if has_upload then
-		local uci = luci.model.uci.cursor()
-		local prm = luci.http.context.request.message.params
-		local fd, cbid
-
-		luci.http.setfilehandler(
-			function( field, chunk, eof )
-				if not field then return end
-				if field.name and not cbid then
-					local c, s, o = field.name:gmatch(
-						"cbid%.([^%.]+)%.([^%.]+)%.([^%.]+)"
-					)()
-
-					if c and s and o then
-						local t = uci:get( c, s ) or s
-						if uploads[c.."."..t.."."..o] then
-							local path = upldir .. field.name
-							fd = io.open(path, "w")
-							if fd then
-								cbid = field.name
-								prm[cbid] = path
-							end
-						end
-					end
-				end
-
-				if field.name == cbid and fd then
-					fd:write(chunk)
-				end
-
-				if eof and fd then
-					fd:close()
-					fd   = nil
-					cbid = nil
-				end
-			end
-		)
-	end
-
-	return maps
-end
-
---
--- Compile a datatype specification into a parse tree for evaluation later on
---
-local cdt_cache = { }
-
-function compile_datatype(code)
-	local i
-	local pos = 0
-	local esc = false
-	local depth = 0
-	local stack = { }
-
-	for i = 1, #code+1 do
-		local byte = code:byte(i) or 44
-		if esc then
-			esc = false
-		elseif byte == 92 then
-			esc = true
-		elseif byte == 40 or byte == 44 then
-			if depth <= 0 then
-				if pos < i then
-					local label = code:sub(pos, i-1)
-						:gsub("\\(.)", "%1")
-						:gsub("^%s+", "")
-						:gsub("%s+$", "")
-
-					if #label > 0 and tonumber(label) then
-						stack[#stack+1] = tonumber(label)
-					elseif label:match("^'.*'$") or label:match('^".*"$') then
-						stack[#stack+1] = label:gsub("[\"'](.*)[\"']", "%1")
-					elseif type(datatypes[label]) == "function" then
-						stack[#stack+1] = datatypes[label]
-						stack[#stack+1] = { }
-					else
-						error("Datatype error, bad token %q" % label)
-					end
-				end
-				pos = i + 1
-			end
-			depth = depth + (byte == 40 and 1 or 0)
-		elseif byte == 41 then
-			depth = depth - 1
-			if depth <= 0 then
-				if type(stack[#stack-1]) ~= "function" then
-					error("Datatype error, argument list follows non-function")
-				end
-				stack[#stack] = compile_datatype(code:sub(pos, i-1))
-				pos = i + 1
-			end
-		end
-	end
-
-	return stack
-end
-
-function verify_datatype(dt, value)
-	if dt and #dt > 0 then
-		if not cdt_cache[dt] then
-			local c = compile_datatype(dt)
-			if c and type(c[1]) == "function" then
-				cdt_cache[dt] = c
-			else
-				error("Datatype error, not a function expression")
-			end
-		end
-		if cdt_cache[dt] then
-			return cdt_cache[dt][1](value, unpack(cdt_cache[dt][2]))
-		end
-	end
-	return true
-end
-
-
--- Node pseudo abstract class
-Node = class()
-
-function Node.__init__(self, title, description)
-	self.children = {}
-	self.title = title or ""
-	self.description = description or ""
-	self.template = "cbi/node"
-end
-
--- hook helper
-function Node._run_hook(self, hook)
-	if type(self[hook]) == "function" then
-		return self[hook](self)
-	end
-end
-
-function Node._run_hooks(self, ...)
-	local f
-	local r = false
-	for _, f in ipairs(arg) do
-		if type(self[f]) == "function" then
-			self[f](self)
-			r = true
-		end
-	end
-	return r
-end
-
--- Prepare nodes
-function Node.prepare(self, ...)
-	for k, child in ipairs(self.children) do
-		child:prepare(...)
-	end
-end
-
--- Append child nodes
-function Node.append(self, obj)
-	table.insert(self.children, obj)
-end
-
--- Parse this node and its children
-function Node.parse(self, ...)
-	for k, child in ipairs(self.children) do
-		child:parse(...)
-	end
-end
-
--- Render this node
-function Node.render(self, scope)
-	scope = scope or {}
-	scope.self = self
-
-	luci.template.render(self.template, scope)
-end
-
--- Render the children
-function Node.render_children(self, ...)
-	local k, node
-	for k, node in ipairs(self.children) do
-		node.last_child = (k == #self.children)
-		node.index = k
-		node:render(...)
-	end
-end
-
-
---[[
-A simple template element
-]]--
-Template = class(Node)
-
-function Template.__init__(self, template)
-	Node.__init__(self)
-	self.template = template
-end
-
-function Template.render(self)
-	luci.template.render(self.template, {self=self})
-end
-
-function Template.parse(self, readinput)
-	self.readinput = (readinput ~= false)
-	return Map.formvalue(self, "cbi.submit") and FORM_DONE or FORM_NODATA
-end
-
-
---[[
-Map - A map describing a configuration file
-]]--
-Map = class(Node)
-
-function Map.__init__(self, config, ...)
-	Node.__init__(self, ...)
-
-	self.config = config
-	self.parsechain = {self.config}
-	self.template = "cbi/map"
-	self.apply_on_parse = nil
-	self.readinput = true
-	self.proceed = false
-	self.flow = {}
-
-	self.uci = uci.cursor()
-	self.save = true
-
-	self.changed = false
-
-	local path = "%s/%s" %{ self.uci:get_confdir(), self.config }
-	if fs.stat(path, "type") ~= "reg" then
-		fs.writefile(path, "")
-	end
-
-	local ok, err = self.uci:load(self.config)
-	if not ok then
-		local url = dispatcher.build_url(unpack(dispatcher.context.request))
-		local source = self:formvalue("cbi.source")
-		if type(source) == "string" then
-			fs.writefile(path, source:gsub("\r\n", "\n"))
-			ok, err = self.uci:load(self.config)
-			if ok then
-				luci.http.redirect(url)
-			end
-		end
-		self.save = false
-	end
-
-	if not ok then
-		self.template   = "cbi/error"
-		self.error      = err
-		self.source     = fs.readfile(path) or ""
-		self.pageaction = false
-	end
-end
-
-function Map.formvalue(self, key)
-	return self.readinput and luci.http.formvalue(key) or nil
-end
-
-function Map.formvaluetable(self, key)
-	return self.readinput and luci.http.formvaluetable(key) or {}
-end
-
-function Map.get_scheme(self, sectiontype, option)
-	if not option then
-		return self.scheme and self.scheme.sections[sectiontype]
-	else
-		return self.scheme and self.scheme.variables[sectiontype]
-		 and self.scheme.variables[sectiontype][option]
-	end
-end
-
-function Map.submitstate(self)
-	return self:formvalue("cbi.submit")
-end
-
--- Chain foreign config
-function Map.chain(self, config)
-	table.insert(self.parsechain, config)
-end
-
-function Map.state_handler(self, state)
-	return state
-end
-
--- Use optimized UCI writing
-function Map.parse(self, readinput, ...)
-	if self:formvalue("cbi.skip") then
-		self.state = FORM_SKIP
-	elseif not self.save then
-		self.state = FORM_INVALID
-	elseif not self:submitstate() then
-		self.state = FORM_NODATA
-	end
-
-	-- Back out early to prevent unauthorized changes on the subsequent parse
-	if self.state ~= nil then
-		return self:state_handler(self.state)
-	end
-
-	self.readinput = (readinput ~= false)
-	self:_run_hooks("on_parse")
-
-	Node.parse(self, ...)
-
-	if self.save then
-		self:_run_hooks("on_save", "on_before_save")
-		local i, config
-		for i, config in ipairs(self.parsechain) do
-			self.uci:save(config)
-		end
-		self:_run_hooks("on_after_save")
-		if (not self.proceed and self.flow.autoapply) or luci.http.formvalue("cbi.apply") then
-			self:_run_hooks("on_before_commit")
-			if self.apply_on_parse == false then
-				for i, config in ipairs(self.parsechain) do
-					self.uci:commit(config)
-				end
-			end
-			self:_run_hooks("on_commit", "on_after_commit", "on_before_apply")
-			if self.apply_on_parse == true or self.apply_on_parse == false then
-				self.uci:apply(self.apply_on_parse)
-				self:_run_hooks("on_apply", "on_after_apply")
-			else
-				-- This is evaluated by the dispatcher and delegated to the
-				-- template which in turn fires XHR to perform the actual
-				-- apply actions.
-				self.apply_needed = true
-			end
-
-			-- Reparse sections
-			Node.parse(self, true)
-		end
-		for i, config in ipairs(self.parsechain) do
-			self.uci:unload(config)
-		end
-		if type(self.commit_handler) == "function" then
-			self:commit_handler(self:submitstate())
-		end
-	end
-
-	if not self.save then
-		self.state = FORM_INVALID
-	elseif self.proceed then
-		self.state = FORM_PROCEED
-	elseif self.changed then
-		self.state = FORM_CHANGED
-	else
-		self.state = FORM_VALID
-	end
-
-	return self:state_handler(self.state)
-end
-
-function Map.render(self, ...)
-	self:_run_hooks("on_init")
-	Node.render(self, ...)
-end
-
--- Creates a child section
-function Map.section(self, class, ...)
-	if instanceof(class, AbstractSection) then
-		local obj  = class(self, ...)
-		self:append(obj)
-		return obj
-	else
-		error("class must be a descendent of AbstractSection")
-	end
-end
-
--- UCI add
-function Map.add(self, sectiontype)
-	return self.uci:add(self.config, sectiontype)
-end
-
--- UCI set
-function Map.set(self, section, option, value)
-	if type(value) ~= "table" or #value > 0 then
-		if option then
-			return self.uci:set(self.config, section, option, value)
-		else
-			return self.uci:set(self.config, section, value)
-		end
-	else
-		return Map.del(self, section, option)
-	end
-end
-
--- UCI del
-function Map.del(self, section, option)
-	if option then
-		return self.uci:delete(self.config, section, option)
-	else
-		return self.uci:delete(self.config, section)
-	end
-end
-
--- UCI get
-function Map.get(self, section, option)
-	if not section then
-		return self.uci:get_all(self.config)
-	elseif option then
-		return self.uci:get(self.config, section, option)
-	else
-		return self.uci:get_all(self.config, section)
-	end
-end
-
---[[
-Compound - Container
-]]--
-Compound = class(Node)
-
-function Compound.__init__(self, ...)
-	Node.__init__(self)
-	self.template = "cbi/compound"
-	self.children = {...}
-end
-
-function Compound.populate_delegator(self, delegator)
-	for _, v in ipairs(self.children) do
-		v.delegator = delegator
-	end
-end
-
-function Compound.parse(self, ...)
-	local cstate, state = 0
-
-	for k, child in ipairs(self.children) do
-		cstate = child:parse(...)
-		state = (not state or cstate < state) and cstate or state
-	end
-
-	return state
-end
-
-
---[[
-Delegator - Node controller
-]]--
-Delegator = class(Node)
-function Delegator.__init__(self, ...)
-	Node.__init__(self, ...)
-	self.nodes = {}
-	self.defaultpath = {}
-	self.pageaction = false
-	self.readinput = true
-	self.allow_reset = false
-	self.allow_cancel = false
-	self.allow_back = false
-	self.allow_finish = false
-	self.template = "cbi/delegator"
-end
-
-function Delegator.set(self, name, node)
-	assert(not self.nodes[name], "Duplicate entry")
-
-	self.nodes[name] = node
-end
-
-function Delegator.add(self, name, node)
-	node = self:set(name, node)
-	self.defaultpath[#self.defaultpath+1] = name
-end
-
-function Delegator.insert_after(self, name, after)
-	local n = #self.chain + 1
-	for k, v in ipairs(self.chain) do
-		if v == after then
-			n = k + 1
-			break
-		end
-	end
-	table.insert(self.chain, n, name)
-end
-
-function Delegator.set_route(self, ...)
-	local n, chain, route = 0, self.chain, {...}
-	for i = 1, #chain do
-		if chain[i] == self.current then
-			n = i
-			break
-		end
-	end
-	for i = 1, #route do
-		n = n + 1
-		chain[n] = route[i]
-	end
-	for i = n + 1, #chain do
-		chain[i] = nil
-	end
-end
-
-function Delegator.get(self, name)
-	local node = self.nodes[name]
-
-	if type(node) == "string" then
-		node = load(node, name)
-	end
-
-	if type(node) == "table" and getmetatable(node) == nil then
-		node = Compound(unpack(node))
-	end
-
-	return node
-end
-
-function Delegator.parse(self, ...)
-	if self.allow_cancel and Map.formvalue(self, "cbi.cancel") then
-		if self:_run_hooks("on_cancel") then
-			return FORM_DONE
-		end
-	end
-
-	if not Map.formvalue(self, "cbi.delg.current") then
-		self:_run_hooks("on_init")
-	end
-
-	local newcurrent
-	self.chain = self.chain or self:get_chain()
-	self.current = self.current or self:get_active()
-	self.active = self.active or self:get(self.current)
-	assert(self.active, "Invalid state")
-
-	local stat = FORM_DONE
-	if type(self.active) ~= "function" then
-		self.active:populate_delegator(self)
-		stat = self.active:parse()
-	else
-		self:active()
-	end
-
-	if stat > FORM_PROCEED then
-		if Map.formvalue(self, "cbi.delg.back") then
-			newcurrent = self:get_prev(self.current)
-		else
-			newcurrent = self:get_next(self.current)
-		end
-	elseif stat < FORM_PROCEED then
-		return stat
-	end
-
-
-	if not Map.formvalue(self, "cbi.submit") then
-		return FORM_NODATA
-	elseif stat > FORM_PROCEED
-	and (not newcurrent or not self:get(newcurrent)) then
-		return self:_run_hook("on_done") or FORM_DONE
-	else
-		self.current = newcurrent or self.current
-		self.active = self:get(self.current)
-		if type(self.active) ~= "function" then
-			self.active:populate_delegator(self)
-			local stat = self.active:parse(false)
-			if stat == FORM_SKIP then
-				return self:parse(...)
-			else
-				return FORM_PROCEED
-			end
-		else
-			return self:parse(...)
-		end
-	end
-end
-
-function Delegator.get_next(self, state)
-	for k, v in ipairs(self.chain) do
-		if v == state then
-			return self.chain[k+1]
-		end
-	end
-end
-
-function Delegator.get_prev(self, state)
-	for k, v in ipairs(self.chain) do
-		if v == state then
-			return self.chain[k-1]
-		end
-	end
-end
-
-function Delegator.get_chain(self)
-	local x = Map.formvalue(self, "cbi.delg.path") or self.defaultpath
-	return type(x) == "table" and x or {x}
-end
-
-function Delegator.get_active(self)
-	return Map.formvalue(self, "cbi.delg.current") or self.chain[1]
-end
-
---[[
-Page - A simple node
-]]--
-
-Page = class(Node)
-Page.__init__ = Node.__init__
-Page.parse    = function() end
-
-
---[[
-SimpleForm - A Simple non-UCI form
-]]--
-SimpleForm = class(Node)
-
-function SimpleForm.__init__(self, config, title, description, data)
-	Node.__init__(self, title, description)
-	self.config = config
-	self.data = data or {}
-	self.template = "cbi/simpleform"
-	self.dorender = true
-	self.pageaction = false
-	self.readinput = true
-end
-
-SimpleForm.formvalue = Map.formvalue
-SimpleForm.formvaluetable = Map.formvaluetable
-
-function SimpleForm.parse(self, readinput, ...)
-	self.readinput = (readinput ~= false)
-
-	if self:formvalue("cbi.skip") then
-		return FORM_SKIP
-	end
-
-	if self:formvalue("cbi.cancel") and self:_run_hooks("on_cancel") then
-		return FORM_DONE
-	end
-
-	if self:submitstate() then
-		Node.parse(self, 1, ...)
-	end
-
-	local valid = true
-	for k, j in ipairs(self.children) do
-		for i, v in ipairs(j.children) do
-			valid = valid
-			 and (not v.tag_missing or not v.tag_missing[1])
-			 and (not v.tag_invalid or not v.tag_invalid[1])
-			 and (not v.error)
-		end
-	end
-
-	local state =
-		not self:submitstate() and FORM_NODATA
-		or valid and FORM_VALID
-		or FORM_INVALID
-
-	self.dorender = not self.handle
-	if self.handle then
-		local nrender, nstate = self:handle(state, self.data)
-		self.dorender = self.dorender or (nrender ~= false)
-		state = nstate or state
-	end
-	return state
-end
-
-function SimpleForm.render(self, ...)
-	if self.dorender then
-		Node.render(self, ...)
-	end
-end
-
-function SimpleForm.submitstate(self)
-	return self:formvalue("cbi.submit")
-end
-
-function SimpleForm.section(self, class, ...)
-	if instanceof(class, AbstractSection) then
-		local obj  = class(self, ...)
-		self:append(obj)
-		return obj
-	else
-		error("class must be a descendent of AbstractSection")
-	end
-end
-
--- Creates a child field
-function SimpleForm.field(self, class, ...)
-	local section
-	for k, v in ipairs(self.children) do
-		if instanceof(v, SimpleSection) then
-			section = v
-			break
-		end
-	end
-	if not section then
-		section = self:section(SimpleSection)
-	end
-
-	if instanceof(class, AbstractValue) then
-		local obj  = class(self, section, ...)
-		obj.track_missing = true
-		section:append(obj)
-		return obj
-	else
-		error("class must be a descendent of AbstractValue")
-	end
-end
-
-function SimpleForm.set(self, section, option, value)
-	self.data[option] = value
-end
-
-
-function SimpleForm.del(self, section, option)
-	self.data[option] = nil
-end
-
-
-function SimpleForm.get(self, section, option)
-	return self.data[option]
-end
-
-
-function SimpleForm.get_scheme()
-	return nil
-end
-
-
-Form = class(SimpleForm)
-
-function Form.__init__(self, ...)
-	SimpleForm.__init__(self, ...)
-	self.embedded = true
-end
-
-
---[[
-AbstractSection
-]]--
-AbstractSection = class(Node)
-
-function AbstractSection.__init__(self, map, sectiontype, ...)
-	Node.__init__(self, ...)
-	self.sectiontype = sectiontype
-	self.map = map
-	self.config = map.config
-	self.optionals = {}
-	self.defaults = {}
-	self.fields = {}
-	self.tag_error = {}
-	self.tag_invalid = {}
-	self.tag_deperror = {}
-	self.changed = false
-
-	self.optional = true
-	self.addremove = false
-	self.dynamic = false
-end
-
--- Define a tab for the section
-function AbstractSection.tab(self, tab, title, desc)
-	self.tabs      = self.tabs      or { }
-	self.tab_names = self.tab_names or { }
-
-	self.tab_names[#self.tab_names+1] = tab
-	self.tabs[tab] = {
-		title       = title,
-		description = desc,
-		childs      = { }
-	}
-end
-
--- Check whether the section has tabs
-function AbstractSection.has_tabs(self)
-	return (self.tabs ~= nil) and (next(self.tabs) ~= nil)
-end
-
--- Appends a new option
-function AbstractSection.option(self, class, option, ...)
-	if instanceof(class, AbstractValue) then
-		local obj  = class(self.map, self, option, ...)
-		self:append(obj)
-		self.fields[option] = obj
-		return obj
-	elseif class == true then
-		error("No valid class was given and autodetection failed.")
-	else
-		error("class must be a descendant of AbstractValue")
-	end
-end
-
--- Appends a new tabbed option
-function AbstractSection.taboption(self, tab, ...)
-
-	assert(tab and self.tabs and self.tabs[tab],
-		"Cannot assign option to not existing tab %q" % tostring(tab))
-
-	local l = self.tabs[tab].childs
-	local o = AbstractSection.option(self, ...)
-
-	if o then l[#l+1] = o end
-
-	return o
-end
-
--- Render a single tab
-function AbstractSection.render_tab(self, tab, ...)
-
-	assert(tab and self.tabs and self.tabs[tab],
-		"Cannot render not existing tab %q" % tostring(tab))
-
-	local k, node
-	for k, node in ipairs(self.tabs[tab].childs) do
-		node.last_child = (k == #self.tabs[tab].childs)
-		node.index = k
-		node:render(...)
-	end
-end
-
--- Parse optional options
-function AbstractSection.parse_optionals(self, section, noparse)
-	if not self.optional then
-		return
-	end
-
-	self.optionals[section] = {}
-
-	local field = nil
-	if not noparse then
-		field = self.map:formvalue("cbi.opt."..self.config.."."..section)
-	end
-
-	for k,v in ipairs(self.children) do
-		if v.optional and not v:cfgvalue(section) and not self:has_tabs() then
-			if field == v.option then
-				field = nil
-				self.map.proceed = true
-			else
-				table.insert(self.optionals[section], v)
-			end
-		end
-	end
-
-	if field and #field > 0 and self.dynamic then
-		self:add_dynamic(field)
-	end
-end
-
--- Add a dynamic option
-function AbstractSection.add_dynamic(self, field, optional)
-	local o = self:option(Value, field, field)
-	o.optional = optional
-end
-
--- Parse all dynamic options
-function AbstractSection.parse_dynamic(self, section)
-	if not self.dynamic then
-		return
-	end
-
-	local arr  = luci.util.clone(self:cfgvalue(section))
-	local form = self.map:formvaluetable("cbid."..self.config.."."..section)
-	for k, v in pairs(form) do
-		arr[k] = v
-	end
-
-	for key,val in pairs(arr) do
-		local create = true
-
-		for i,c in ipairs(self.children) do
-			if c.option == key then
-				create = false
-			end
-		end
-
-		if create and key:sub(1, 1) ~= "." then
-			self.map.proceed = true
-			self:add_dynamic(key, true)
-		end
-	end
-end
-
--- Returns the section's UCI table
-function AbstractSection.cfgvalue(self, section)
-	return self.map:get(section)
-end
-
--- Push events
-function AbstractSection.push_events(self)
-	--luci.util.append(self.map.events, self.events)
-	self.map.changed = true
-end
-
--- Removes the section
-function AbstractSection.remove(self, section)
-	self.map.proceed = true
-	return self.map:del(section)
-end
-
--- Creates the section
-function AbstractSection.create(self, section)
-	local stat
-
-	if section then
-		stat = section:match("^[%w_]+$") and self.map:set(section, nil, self.sectiontype)
-	else
-		section = self.map:add(self.sectiontype)
-		stat = section
-	end
-
-	if stat then
-		for k,v in pairs(self.children) do
-			if v.default then
-				self.map:set(section, v.option, v.default)
-			end
-		end
-
-		for k,v in pairs(self.defaults) do
-			self.map:set(section, k, v)
-		end
-	end
-
-	self.map.proceed = true
-
-	return stat
-end
-
-
-SimpleSection = class(AbstractSection)
-
-function SimpleSection.__init__(self, form, ...)
-	AbstractSection.__init__(self, form, nil, ...)
-	self.template = "cbi/nullsection"
-end
-
-
-Table = class(AbstractSection)
-
-function Table.__init__(self, form, data, ...)
-	local datasource = {}
-	local tself = self
-	datasource.config = "table"
-	self.data = data or {}
-
-	datasource.formvalue = Map.formvalue
-	datasource.formvaluetable = Map.formvaluetable
-	datasource.readinput = true
-
-	function datasource.get(self, section, option)
-		return tself.data[section] and tself.data[section][option]
-	end
-
-	function datasource.submitstate(self)
-		return Map.formvalue(self, "cbi.submit")
-	end
-
-	function datasource.del(...)
-		return true
-	end
-
-	function datasource.get_scheme()
-		return nil
-	end
-
-	AbstractSection.__init__(self, datasource, "table", ...)
-	self.template = "cbi/tblsection"
-	self.rowcolors = true
-	self.anonymous = true
-end
-
-function Table.parse(self, readinput)
-	self.map.readinput = (readinput ~= false)
-	for i, k in ipairs(self:cfgsections()) do
-		if self.map:submitstate() then
-			Node.parse(self, k)
-		end
-	end
-end
-
-function Table.cfgsections(self)
-	local sections = {}
-
-	for i, v in luci.util.kspairs(self.data) do
-		table.insert(sections, i)
-	end
-
-	return sections
-end
-
-function Table.update(self, data)
-	self.data = data
-end
-
-
-
---[[
-NamedSection - A fixed configuration section defined by its name
-]]--
-NamedSection = class(AbstractSection)
-
-function NamedSection.__init__(self, map, section, stype, ...)
-	AbstractSection.__init__(self, map, stype, ...)
-
-	-- Defaults
-	self.addremove = false
-	self.template = "cbi/nsection"
-	self.section = section
-end
-
-function NamedSection.prepare(self)
-	AbstractSection.prepare(self)
-	AbstractSection.parse_optionals(self, self.section, true)
-end
-
-function NamedSection.parse(self, novld)
-	local s = self.section
-	local active = self:cfgvalue(s)
-
-	if self.addremove then
-		local path = self.config.."."..s
-		if active then -- Remove the section
-			if self.map:formvalue("cbi.rns."..path) and self:remove(s) then
-				self:push_events()
-				return
-			end
-		else           -- Create and apply default values
-			if self.map:formvalue("cbi.cns."..path) then
-				self:create(s)
-				return
-			end
-		end
-	end
-
-	if active then
-		AbstractSection.parse_dynamic(self, s)
-		if self.map:submitstate() then
-			Node.parse(self, s)
-		end
-		AbstractSection.parse_optionals(self, s)
-
-		if self.changed then
-			self:push_events()
-		end
-	end
-end
-
-
---[[
-TypedSection - A (set of) configuration section(s) defined by the type
-	addremove: 	Defines whether the user can add/remove sections of this type
-	anonymous:  Allow creating anonymous sections
-	validate: 	a validation function returning nil if the section is invalid
-]]--
-TypedSection = class(AbstractSection)
-
-function TypedSection.__init__(self, map, type, ...)
-	AbstractSection.__init__(self, map, type, ...)
-
-	self.template = "cbi/tsection"
-	self.deps = {}
-	self.anonymous = false
-end
-
-function TypedSection.prepare(self)
-	AbstractSection.prepare(self)
-
-	local i, s
-	for i, s in ipairs(self:cfgsections()) do
-		AbstractSection.parse_optionals(self, s, true)
-	end
-end
-
--- Return all matching UCI sections for this TypedSection
-function TypedSection.cfgsections(self)
-	local sections = {}
-	self.map.uci:foreach(self.map.config, self.sectiontype,
-		function (section)
-			if self:checkscope(section[".name"]) then
-				table.insert(sections, section[".name"])
-			end
-		end)
-
-	return sections
-end
-
--- Limits scope to sections that have certain option => value pairs
-function TypedSection.depends(self, option, value)
-	table.insert(self.deps, {option=option, value=value})
-end
-
-function TypedSection.parse(self, novld)
-	if self.addremove then
-		-- Remove
-		local crval = REMOVE_PREFIX .. self.config
-		local name = self.map:formvaluetable(crval)
-		for k,v in pairs(name) do
-			if k:sub(-2) == ".x" then
-				k = k:sub(1, #k - 2)
-			end
-			if self:cfgvalue(k) and self:checkscope(k) then
-				self:remove(k)
-			end
-		end
-	end
-
-	local co
-	for i, k in ipairs(self:cfgsections()) do
-		AbstractSection.parse_dynamic(self, k)
-		if self.map:submitstate() then
-			Node.parse(self, k, novld)
-		end
-		AbstractSection.parse_optionals(self, k)
-	end
-
-	if self.addremove then
-		-- Create
-		local created
-		local crval = CREATE_PREFIX .. self.config .. "." .. self.sectiontype
-		local origin, name = next(self.map:formvaluetable(crval))
-		if self.anonymous then
-			if name then
-				created = self:create(nil, origin)
-			end
-		else
-			if name then
-				-- Ignore if it already exists
-				if self:cfgvalue(name) then
-					name = nil
-					self.err_invalid = true
-				else
-					name = self:checkscope(name)
-
-					if not name then
-						self.err_invalid = true
-					end
-
-					if name and #name > 0 then
-						created = self:create(name, origin) and name
-						if not created then
-							self.invalid_cts = true
-						end
-					end
-				end
-			end
-		end
-
-		if created then
-			AbstractSection.parse_optionals(self, created)
-		end
-	end
-
-	if self.sortable then
-		local stval = RESORT_PREFIX .. self.config .. "." .. self.sectiontype
-		local order = self.map:formvalue(stval)
-		if order and #order > 0 then
-			local sids, sid = { }, nil
-			for sid in util.imatch(order) do
-				sids[#sids+1] = sid
-			end
-			if #sids > 0 then
-				self.map.uci:reorder(self.config, sids)
-				self.changed = true
-			end
-		end
-	end
-
-	if created or self.changed then
-		self:push_events()
-	end
-end
-
--- Verifies scope of sections
-function TypedSection.checkscope(self, section)
-	-- Check if we are not excluded
-	if self.filter and not self:filter(section) then
-		return nil
-	end
-
-	-- Check if at least one dependency is met
-	if #self.deps > 0 and self:cfgvalue(section) then
-		local stat = false
-
-		for k, v in ipairs(self.deps) do
-			if self:cfgvalue(section)[v.option] == v.value then
-				stat = true
-			end
-		end
-
-		if not stat then
-			return nil
-		end
-	end
-
-	return self:validate(section)
-end
-
-
--- Dummy validate function
-function TypedSection.validate(self, section)
-	return section
-end
-
-
---[[
-AbstractValue - An abstract Value Type
-	null:		Value can be empty
-	valid:		A function returning the value if it is valid otherwise nil
-	depends:	A table of option => value pairs of which one must be true
-	default:	The default value
-	size:		The size of the input fields
-	rmempty:	Unset value if empty
-	optional:	This value is optional (see AbstractSection.optionals)
-]]--
-AbstractValue = class(Node)
-
-function AbstractValue.__init__(self, map, section, option, ...)
-	Node.__init__(self, ...)
-	self.section = section
-	self.option  = option
-	self.map     = map
-	self.config  = map.config
-	self.tag_invalid = {}
-	self.tag_missing = {}
-	self.tag_reqerror = {}
-	self.tag_error = {}
-	self.deps = {}
-	--self.cast = "string"
-
-	self.track_missing = false
-	self.rmempty   = true
-	self.default   = nil
-	self.size      = nil
-	self.optional  = false
-end
-
-function AbstractValue.prepare(self)
-	self.cast = self.cast or "string"
-end
-
--- Add a dependencie to another section field
-function AbstractValue.depends(self, field, value)
-	local deps
-	if type(field) == "string" then
-		deps = {}
-	 	deps[field] = value
-	else
-		deps = field
-	end
-
-	table.insert(self.deps, deps)
-end
-
--- Serialize dependencies
-function AbstractValue.deplist2json(self, section, deplist)
-	local deps, i, d = { }
-
-	if type(self.deps) == "table" then
-		for i, d in ipairs(deplist or self.deps) do
-			local a, k, v = { }
-			for k, v in pairs(d) do
-				if k:find("!", 1, true) then
-					a[k] = v
-				elseif k:find(".", 1, true) then
-					a['cbid.%s' % k] = v
-				else
-					a['cbid.%s.%s.%s' %{ self.config, section, k }] = v
-				end
-			end
-			deps[#deps+1] = a
-		end
-	end
-
-	return util.serialize_json(deps)
-end
-
--- Serialize choices
-function AbstractValue.choices(self)
-	if type(self.keylist) == "table" and #self.keylist > 0 then
-		local i, k, v = nil, nil, {}
-		for i, k in ipairs(self.keylist) do
-			v[k] = self.vallist[i] or k
-		end
-		return v
-	end
-	return nil
-end
-
--- Generates the unique CBID
-function AbstractValue.cbid(self, section)
-	return "cbid."..self.map.config.."."..section.."."..self.option
-end
-
--- Return whether this object should be created
-function AbstractValue.formcreated(self, section)
-	local key = "cbi.opt."..self.config.."."..section
-	return (self.map:formvalue(key) == self.option)
-end
-
--- Returns the formvalue for this object
-function AbstractValue.formvalue(self, section)
-	return self.map:formvalue(self:cbid(section))
-end
-
-function AbstractValue.additional(self, value)
-	self.optional = value
-end
-
-function AbstractValue.mandatory(self, value)
-	self.rmempty = not value
-end
-
-function AbstractValue.add_error(self, section, type, msg)
-	self.error = self.error or { }
-	self.error[section] = msg or type
-
-	self.section.error = self.section.error or { }
-	self.section.error[section] = self.section.error[section] or { }
-	table.insert(self.section.error[section], msg or type)
-
-	if type == "invalid" then
-		self.tag_invalid[section] = true
-	elseif type == "missing" then
-		self.tag_missing[section] = true
-	end
-
-	self.tag_error[section] = true
-	self.map.save = false
-end
-
-function AbstractValue.parse(self, section, novld)
-	local fvalue = self:formvalue(section)
-	local cvalue = self:cfgvalue(section)
-
-	-- If favlue and cvalue are both tables and have the same content
-	-- make them identical
-	if type(fvalue) == "table" and type(cvalue) == "table" then
-		local equal = #fvalue == #cvalue
-		if equal then
-			for i=1, #fvalue do
-				if cvalue[i] ~= fvalue[i] then
-					equal = false
-				end
-			end
-		end
-		if equal then
-			fvalue = cvalue
-		end
-	end
-
-	if fvalue and #fvalue > 0 then -- If we have a form value, write it to UCI
-		local val_err
-		fvalue, val_err = self:validate(fvalue, section)
-		fvalue = self:transform(fvalue)
-
-		if not fvalue and not novld then
-			self:add_error(section, "invalid", val_err)
-		end
-
-		if self.alias then
-			self.section.aliased = self.section.aliased or {}
-			self.section.aliased[section] = self.section.aliased[section] or {}
-			self.section.aliased[section][self.alias] = true
-		end
-
-		if fvalue and (self.forcewrite or not (fvalue == cvalue)) then
-			if self:write(section, fvalue) then
-				-- Push events
-				self.section.changed = true
-				--luci.util.append(self.map.events, self.events)
-			end
-		end
-	else							-- Unset the UCI or error
-		if self.rmempty or self.optional then
-			if not self.alias or
-			   not self.section.aliased or
-			   not self.section.aliased[section] or
-			   not self.section.aliased[section][self.alias]
-			then
-				if self:remove(section) then
-					-- Push events
-					self.section.changed = true
-					--luci.util.append(self.map.events, self.events)
-				end
-			end
-		elseif cvalue ~= fvalue and not novld then
-			-- trigger validator with nil value to get custom user error msg.
-			local _, val_err = self:validate(nil, section)
-			self:add_error(section, "missing", val_err)
-		end
-	end
-end
-
--- Render if this value exists or if it is mandatory
-function AbstractValue.render(self, s, scope)
-	if not self.optional or self.section:has_tabs() or self:cfgvalue(s) or self:formcreated(s) then
-		scope = scope or {}
-		scope.section = s
-		scope.cbid    = self:cbid(s)
-		Node.render(self, scope)
-	end
-end
-
--- Return the UCI value of this object
-function AbstractValue.cfgvalue(self, section)
-	local value
-	if self.tag_error[section] then
-		value = self:formvalue(section)
-	else
-		value = self.map:get(section, self.alias or self.option)
-	end
-
-	if not value then
-		return nil
-	elseif not self.cast or self.cast == type(value) then
-		return value
-	elseif self.cast == "string" then
-		if type(value) == "table" then
-			return value[1]
-		end
-	elseif self.cast == "table" then
-		return { value }
-	end
-end
-
--- Validate the form value
-function AbstractValue.validate(self, value)
-	if self.datatype and value then
-		if type(value) == "table" then
-			local v
-			for _, v in ipairs(value) do
-				if v and #v > 0 and not verify_datatype(self.datatype, v) then
-					return nil
-				end
-			end
-		else
-			if not verify_datatype(self.datatype, value) then
-				return nil
-			end
-		end
-	end
-
-	return value
-end
-
-AbstractValue.transform = AbstractValue.validate
-
-
--- Write to UCI
-function AbstractValue.write(self, section, value)
-	return self.map:set(section, self.alias or self.option, value)
-end
-
--- Remove from UCI
-function AbstractValue.remove(self, section)
-	return self.map:del(section, self.alias or self.option)
-end
-
-
-
-
---[[
-Value - A one-line value
-	maxlength:	The maximum length
-]]--
-Value = class(AbstractValue)
-
-function Value.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template  = "cbi/value"
-	self.keylist = {}
-	self.vallist = {}
-	self.readonly = nil
-end
-
-function Value.reset_values(self)
-	self.keylist = {}
-	self.vallist = {}
-end
-
-function Value.value(self, key, val)
-	val = val or key
-	table.insert(self.keylist, tostring(key))
-	table.insert(self.vallist, tostring(val))
-end
-
-function Value.parse(self, section, novld)
-	if self.readonly then return end
-	AbstractValue.parse(self, section, novld)
-end
-
--- DummyValue - This does nothing except being there
-DummyValue = class(AbstractValue)
-
-function DummyValue.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template = "cbi/dvalue"
-	self.value = nil
-end
-
-function DummyValue.cfgvalue(self, section)
-	local value
-	if self.value then
-		if type(self.value) == "function" then
-			value = self:value(section)
-		else
-			value = self.value
-		end
-	else
-		value = AbstractValue.cfgvalue(self, section)
-	end
-	return value
-end
-
-function DummyValue.parse(self)
-
-end
-
-
---[[
-Flag - A flag being enabled or disabled
-]]--
-Flag = class(AbstractValue)
-
-function Flag.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template  = "cbi/fvalue"
-
-	self.enabled  = "1"
-	self.disabled = "0"
-	self.default  = self.disabled
-end
-
--- A flag can only have two states: set or unset
-function Flag.parse(self, section, novld)
-	local fexists = self.map:formvalue(
-		FEXIST_PREFIX .. self.config .. "." .. section .. "." .. self.option)
-
-	if fexists then
-		local fvalue = self:formvalue(section) and self.enabled or self.disabled
-		local cvalue = self:cfgvalue(section)
-		local val_err
-		fvalue, val_err = self:validate(fvalue, section)
-		if not fvalue then
-			if not novld then
-				self:add_error(section, "invalid", val_err)
-			end
-			return
-		end
-		if fvalue == self.default and (self.optional or self.rmempty) then
-			self:remove(section)
-		else
-			self:write(section, fvalue)
-		end
-		if (fvalue ~= cvalue) then self.section.changed = true end
-	else
-		self:remove(section)
-		self.section.changed = true
-	end
-end
-
-function Flag.cfgvalue(self, section)
-	return AbstractValue.cfgvalue(self, section) or self.default
-end
-function Flag.validate(self, value)
-	return value
-end
-
---[[
-ListValue - A one-line value predefined in a list
-	widget: The widget that will be used (select, radio)
-]]--
-ListValue = class(AbstractValue)
-
-function ListValue.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template  = "cbi/lvalue"
-
-	self.size   = 1
-	self.widget = "select"
-
-	self:reset_values()
-end
-
-function ListValue.reset_values(self)
-	self.keylist = {}
-	self.vallist = {}
-	self.deplist = {}
-end
-
-function ListValue.value(self, key, val, ...)
-	if luci.util.contains(self.keylist, key) then
-		return
-	end
-
-	val = val or key
-	table.insert(self.keylist, tostring(key))
-	table.insert(self.vallist, tostring(val))
-	table.insert(self.deplist, {...})
-end
-
-function ListValue.validate(self, val)
-	if luci.util.contains(self.keylist, val) then
-		return val
-	else
-		return nil
-	end
-end
-
-
-
---[[
-MultiValue - Multiple delimited values
-	widget: The widget that will be used (select, checkbox)
-	delimiter: The delimiter that will separate the values (default: " ")
-]]--
-MultiValue = class(AbstractValue)
-
-function MultiValue.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template = "cbi/mvalue"
-
-	self.widget = "checkbox"
-	self.delimiter = " "
-
-	self:reset_values()
-end
-
-function MultiValue.render(self, ...)
-	if self.widget == "select" and not self.size then
-		self.size = #self.vallist
-	end
-
-	AbstractValue.render(self, ...)
-end
-
-function MultiValue.reset_values(self)
-	self.keylist = {}
-	self.vallist = {}
-	self.deplist = {}
-end
-
-function MultiValue.value(self, key, val)
-	if luci.util.contains(self.keylist, key) then
-		return
-	end
-
-	val = val or key
-	table.insert(self.keylist, tostring(key))
-	table.insert(self.vallist, tostring(val))
-end
-
-function MultiValue.valuelist(self, section)
-	local val = self:cfgvalue(section)
-
-	if not(type(val) == "string") then
-		return {}
-	end
-
-	return luci.util.split(val, self.delimiter)
-end
-
-function MultiValue.validate(self, val)
-	val = (type(val) == "table") and val or {val}
-
-	local result
-
-	for i, value in ipairs(val) do
-		if luci.util.contains(self.keylist, value) then
-			result = result and (result .. self.delimiter .. value) or value
-		end
-	end
-
-	return result
-end
-
-
-StaticList = class(MultiValue)
-
-function StaticList.__init__(self, ...)
-	MultiValue.__init__(self, ...)
-	self.cast = "table"
-	self.valuelist = self.cfgvalue
-
-	if not self.override_scheme
-	 and self.map:get_scheme(self.section.sectiontype, self.option) then
-		local vs = self.map:get_scheme(self.section.sectiontype, self.option)
-		if self.value and vs.values and not self.override_values then
-			for k, v in pairs(vs.values) do
-				self:value(k, v)
-			end
-		end
-	end
-end
-
-function StaticList.validate(self, value)
-	value = (type(value) == "table") and value or {value}
-
-	local valid = {}
-	for i, v in ipairs(value) do
-		if luci.util.contains(self.keylist, v) then
-			table.insert(valid, v)
-		end
-	end
-	return valid
-end
-
-
-DynamicList = class(AbstractValue)
-
-function DynamicList.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template  = "cbi/dynlist"
-	self.cast = "table"
-	self:reset_values()
-end
-
-function DynamicList.reset_values(self)
-	self.keylist = {}
-	self.vallist = {}
-end
-
-function DynamicList.value(self, key, val)
-	val = val or key
-	table.insert(self.keylist, tostring(key))
-	table.insert(self.vallist, tostring(val))
-end
-
-function DynamicList.write(self, section, value)
-	local t = { }
-
-	if type(value) == "table" then
-		local x
-		for _, x in ipairs(value) do
-			if x and #x > 0 then
-				t[#t+1] = x
-			end
-		end
-	else
-		t = { value }
-	end
-
-	if self.cast == "string" then
-		value = table.concat(t, " ")
-	else
-		value = t
-	end
-
-	return AbstractValue.write(self, section, value)
-end
-
-function DynamicList.cfgvalue(self, section)
-	local value = AbstractValue.cfgvalue(self, section)
-
-	if type(value) == "string" then
-		local x
-		local t = { }
-		for x in value:gmatch("%S+") do
-			if #x > 0 then
-				t[#t+1] = x
-			end
-		end
-		value = t
-	end
-
-	return value
-end
-
-function DynamicList.formvalue(self, section)
-	local value = AbstractValue.formvalue(self, section)
-
-	if type(value) == "string" then
-		if self.cast == "string" then
-			local x
-			local t = { }
-			for x in value:gmatch("%S+") do
-				t[#t+1] = x
-			end
-			value = t
-		else
-			value = { value }
-		end
-	end
-
-	return value
-end
-
-
-DropDown = class(MultiValue)
-
-function DropDown.__init__(self, ...)
-	ListValue.__init__(self, ...)
-	self.template = "cbi/dropdown"
-	self.delimiter = " "
-end
-
-
---[[
-TextValue - A multi-line value
-	rows:	Rows
-]]--
-TextValue = class(AbstractValue)
-
-function TextValue.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template  = "cbi/tvalue"
-end
-
---[[
-Button
-]]--
-Button = class(AbstractValue)
-
-function Button.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template  = "cbi/button"
-	self.inputstyle = nil
-	self.rmempty = true
-        self.unsafeupload = false
-end
-
-
-FileUpload = class(AbstractValue)
-
-function FileUpload.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template = "cbi/upload"
-	if not self.map.upload_fields then
-		self.map.upload_fields = { self }
-	else
-		self.map.upload_fields[#self.map.upload_fields+1] = self
-	end
-end
-
-function FileUpload.formcreated(self, section)
-	if self.unsafeupload then
-		return AbstractValue.formcreated(self, section) or
-			self.map:formvalue("cbi.rlf."..section.."."..self.option) or
-			self.map:formvalue("cbi.rlf."..section.."."..self.option..".x") or
-			self.map:formvalue("cbid."..self.map.config.."."..section.."."..self.option..".textbox")
-	else
-		return AbstractValue.formcreated(self, section) or
-			self.map:formvalue("cbid."..self.map.config.."."..section.."."..self.option..".textbox")
-	end
-end
-
-function FileUpload.cfgvalue(self, section)
-	local val = AbstractValue.cfgvalue(self, section)
-	if val and fs.access(val) then
-		return val
-	end
-	return nil
-end
-
--- If we have a new value, use it
--- otherwise use old value
--- deletion should be managed by a separate button object
--- unless self.unsafeupload is set in which case if the user
--- choose to remove the old file we do so.
--- Also, allow to specify (via textbox) a file already on router
-function FileUpload.formvalue(self, section)
-	local val = AbstractValue.formvalue(self, section)
-	if val then
-		if self.unsafeupload then
-			if not self.map:formvalue("cbi.rlf."..section.."."..self.option) and
-		   	    not self.map:formvalue("cbi.rlf."..section.."."..self.option..".x")
-			then
-				return val
-			end
-			fs.unlink(val)
-			self.value = nil
-			return nil
-                elseif val ~= "" then
-			return val
-                end
-	end
-	val = luci.http.formvalue("cbid."..self.map.config.."."..section.."."..self.option..".textbox")
-	if val == "" then
-		val = nil
-	end
-        if not self.unsafeupload then
-		if not val then
-			val = self.map:formvalue("cbi.rlf."..section.."."..self.option)
-		end
-        end
-	return val
-end
-
-function FileUpload.remove(self, section)
-	if self.unsafeupload then
-		local val = AbstractValue.formvalue(self, section)
-		if val and fs.access(val) then fs.unlink(val) end
-		return AbstractValue.remove(self, section)
-	else
-		return nil
-	end
-end
-
-FileBrowser = class(AbstractValue)
-
-function FileBrowser.__init__(self, ...)
-	AbstractValue.__init__(self, ...)
-	self.template = "cbi/browser"
-end
diff --git a/modules/luci-base/luasrc/cbi/datatypes.lua b/modules/luci-base/luasrc/cbi/datatypes.lua
deleted file mode 100644
index c1cf01f9c..000000000
--- a/modules/luci-base/luasrc/cbi/datatypes.lua
+++ /dev/null
@@ -1,470 +0,0 @@
--- Copyright 2010 Jo-Philipp Wich <jow@openwrt.org>
--- Copyright 2017 Dan Luedtke <mail@danrl.com>
--- Licensed to the public under the Apache License 2.0.
-
-local fs = require "nixio.fs"
-local ip = require "luci.ip"
-local math = require "math"
-local util = require "luci.util"
-local tonumber, tostring, type, unpack, select = tonumber, tostring, type, unpack, select
-
-
-module "luci.cbi.datatypes"
-
-
-_M['or'] = function(v, ...)
-	local i
-	for i = 1, select('#', ...), 2 do
-		local f = select(i, ...)
-		local a = select(i+1, ...)
-		if type(f) ~= "function" then
-			if f == v then
-				return true
-			end
-			i = i - 1
-		elseif f(v, unpack(a)) then
-			return true
-		end
-	end
-	return false
-end
-
-_M['and'] = function(v, ...)
-	local i
-	for i = 1, select('#', ...), 2 do
-		local f = select(i, ...)
-		local a = select(i+1, ...)
-		if type(f) ~= "function" then
-			if f ~= v then
-				return false
-			end
-			i = i - 1
-		elseif not f(v, unpack(a)) then
-			return false
-		end
-	end
-	return true
-end
-
-function neg(v, ...)
-	return _M['or'](v:gsub("^%s*!%s*", ""), ...)
-end
-
-function list(v, subvalidator, subargs)
-	if type(subvalidator) ~= "function" then
-		return false
-	end
-	local token
-	for token in v:gmatch("%S+") do
-		if not subvalidator(token, unpack(subargs)) then
-			return false
-		end
-	end
-	return true
-end
-
-function bool(val)
-	if val == "1" or val == "yes" or val == "on" or val == "true" then
-		return true
-	elseif val == "0" or val == "no" or val == "off" or val == "false" then
-		return true
-	elseif val == "" or val == nil then
-		return true
-	end
-
-	return false
-end
-
-function uinteger(val)
-	local n = tonumber(val)
-	if n ~= nil and math.floor(n) == n and n >= 0 then
-		return true
-	end
-
-	return false
-end
-
-function integer(val)
-	local n = tonumber(val)
-	if n ~= nil and math.floor(n) == n then
-		return true
-	end
-
-	return false
-end
-
-function ufloat(val)
-	local n = tonumber(val)
-	return ( n ~= nil and n >= 0 )
-end
-
-function float(val)
-	return ( tonumber(val) ~= nil )
-end
-
-function ipaddr(val)
-	return ip4addr(val) or ip6addr(val)
-end
-
-function ip4addr(val)
-	if val then
-		return ip.IPv4(val) and true or false
-	end
-
-	return false
-end
-
-function ip4prefix(val)
-	val = tonumber(val)
-	return ( val and val >= 0 and val <= 32 )
-end
-
-function ip6addr(val)
-	if val then
-		return ip.IPv6(val) and true or false
-	end
-
-	return false
-end
-
-function ip6prefix(val)
-	val = tonumber(val)
-	return ( val and val >= 0 and val <= 128 )
-end
-
-function cidr(val)
-	return cidr4(val) or cidr6(val)
-end
-
-function cidr4(val)
-	local ip, mask = val:match("^([^/]+)/([^/]+)$")
-
-	return ip4addr(ip) and ip4prefix(mask)
-end
-
-function cidr6(val)
-	local ip, mask = val:match("^([^/]+)/([^/]+)$")
-
-	return ip6addr(ip) and ip6prefix(mask)
-end
-
-function ipnet4(val)
-	local ip, mask = val:match("^([^/]+)/([^/]+)$")
-
-	return ip4addr(ip) and ip4addr(mask)
-end
-
-function ipnet6(val)
-	local ip, mask = val:match("^([^/]+)/([^/]+)$")
-
-	return ip6addr(ip) and ip6addr(mask)
-end
-
-function ipmask(val)
-	return ipmask4(val) or ipmask6(val)
-end
-
-function ipmask4(val)
-	return cidr4(val) or ipnet4(val) or ip4addr(val)
-end
-
-function ipmask6(val)
-	return cidr6(val) or ipnet6(val) or ip6addr(val)
-end
-
-function ip6hostid(val)
-	if val == "eui64" or val == "random" then
-		return true
-	else
-		local addr = ip.IPv6(val)
-		if addr and addr:prefix() == 128 and addr:lower("::1:0:0:0:0") then
-			return true
-		end
-	end
-
-	return false
-end
-
-function port(val)
-	val = tonumber(val)
-	return ( val and val >= 0 and val <= 65535 )
-end
-
-function portrange(val)
-	local p1, p2 = val:match("^(%d+)%-(%d+)$")
-	if p1 and p2 and port(p1) and port(p2) then
-		return true
-	else
-		return port(val)
-	end
-end
-
-function macaddr(val)
-	return ip.checkmac(val) and true or false
-end
-
-function hostname(val, strict)
-	if val and (#val < 254) and (
-	   val:match("^[a-zA-Z_]+$") or
-	   (val:match("^[a-zA-Z0-9_][a-zA-Z0-9_%-%.]*[a-zA-Z0-9]$") and
-	    val:match("[^0-9%.]"))
-	) then
-		return (not strict or not val:match("^_"))
-	end
-	return false
-end
-
-function host(val, ipv4only)
-	return hostname(val) or ((ipv4only == 1) and ip4addr(val)) or ((not (ipv4only == 1)) and ipaddr(val))
-end
-
-function network(val)
-	return uciname(val) or host(val)
-end
-
-function hostport(val, ipv4only)
-	local h, p = val:match("^([^:]+):([^:]+)$")
-	return not not (h and p and host(h, ipv4only) and port(p))
-end
-
-function ip4addrport(val, bracket)
-	local h, p = val:match("^([^:]+):([^:]+)$")
-	return (h and p and ip4addr(h) and port(p))
-end
-
-function ip4addrport(val)
-	local h, p = val:match("^([^:]+):([^:]+)$")
-	return (h and p and ip4addr(h) and port(p))
-end
-
-function ipaddrport(val, bracket)
-	local h, p = val:match("^([^%[%]:]+):([^:]+)$")
-	if (h and p and ip4addr(h) and port(p)) then
-		return true
-	elseif (bracket == 1) then
-		h, p = val:match("^%[(.+)%]:([^:]+)$")
-		if  (h and p and ip6addr(h) and port(p)) then
-			return true
-		end
-	end
-	h, p = val:match("^([^%[%]]+):([^:]+)$")
-	return (h and p and ip6addr(h) and port(p))
-end
-
-function wpakey(val)
-	if #val == 64 then
-		return (val:match("^[a-fA-F0-9]+$") ~= nil)
-	else
-		return (#val >= 8) and (#val <= 63)
-	end
-end
-
-function wepkey(val)
-	if val:sub(1, 2) == "s:" then
-		val = val:sub(3)
-	end
-
-	if (#val == 10) or (#val == 26) then
-		return (val:match("^[a-fA-F0-9]+$") ~= nil)
-	else
-		return (#val == 5) or (#val == 13)
-	end
-end
-
-function hexstring(val)
-	if val then
-		return (val:match("^[a-fA-F0-9]+$") ~= nil)
-	end
-	return false
-end
-
-function hex(val, maxbytes)
-	maxbytes = tonumber(maxbytes)
-	if val and maxbytes ~= nil then
-		return ((val:match("^0x[a-fA-F0-9]+$") ~= nil) and (#val <= 2 + maxbytes * 2))
-	end
-	return false
-end
-
-function base64(val)
-	if val then
-		return (val:match("^[a-zA-Z0-9/+]+=?=?$") ~= nil) and (math.fmod(#val, 4) == 0)
-	end
-	return false
-end
-
-function string(val)
-	return true		-- Everything qualifies as valid string
-end
-
-function directory(val, seen)
-	local s = fs.stat(val)
-	seen = seen or { }
-
-	if s and not seen[s.ino] then
-		seen[s.ino] = true
-		if s.type == "dir" then
-			return true
-		elseif s.type == "lnk" then
-			return directory( fs.readlink(val), seen )
-		end
-	end
-
-	return false
-end
-
-function file(val, seen)
-	local s = fs.stat(val)
-	seen = seen or { }
-
-	if s and not seen[s.ino] then
-		seen[s.ino] = true
-		if s.type == "reg" then
-			return true
-		elseif s.type == "lnk" then
-			return file( fs.readlink(val), seen )
-		end
-	end
-
-	return false
-end
-
-function device(val, seen)
-	local s = fs.stat(val)
-	seen = seen or { }
-
-	if s and not seen[s.ino] then
-		seen[s.ino] = true
-		if s.type == "chr" or s.type == "blk" then
-			return true
-		elseif s.type == "lnk" then
-			return device( fs.readlink(val), seen )
-		end
-	end
-
-	return false
-end
-
-function uciname(val)
-	return (val:match("^[a-zA-Z0-9_]+$") ~= nil)
-end
-
-function range(val, min, max)
-	val = tonumber(val)
-	min = tonumber(min)
-	max = tonumber(max)
-
-	if val ~= nil and min ~= nil and max ~= nil then
-		return ((val >= min) and (val <= max))
-	end
-
-	return false
-end
-
-function min(val, min)
-	val = tonumber(val)
-	min = tonumber(min)
-
-	if val ~= nil and min ~= nil then
-		return (val >= min)
-	end
-
-	return false
-end
-
-function max(val, max)
-	val = tonumber(val)
-	max = tonumber(max)
-
-	if val ~= nil and max ~= nil then
-		return (val <= max)
-	end
-
-	return false
-end
-
-function rangelength(val, min, max)
-	val = tostring(val)
-	min = tonumber(min)
-	max = tonumber(max)
-
-	if val ~= nil and min ~= nil and max ~= nil then
-		return ((#val >= min) and (#val <= max))
-	end
-
-	return false
-end
-
-function minlength(val, min)
-	val = tostring(val)
-	min = tonumber(min)
-
-	if val ~= nil and min ~= nil then
-		return (#val >= min)
-	end
-
-	return false
-end
-
-function maxlength(val, max)
-	val = tostring(val)
-	max = tonumber(max)
-
-	if val ~= nil and max ~= nil then
-		return (#val <= max)
-	end
-
-	return false
-end
-
-function phonedigit(val)
-	return (val:match("^[0-9%*#!%.]+$") ~= nil)
-end
-
-function timehhmmss(val)
-	return (val:match("^[0-6][0-9]:[0-6][0-9]:[0-6][0-9]$") ~= nil)
-end
-
-function dateyyyymmdd(val)
-	if val ~= nil then
-		yearstr, monthstr, daystr = val:match("^(%d%d%d%d)-(%d%d)-(%d%d)$")
-		if (yearstr == nil) or (monthstr == nil) or (daystr == nil) then
-			return false;
-		end
-		year = tonumber(yearstr)
-		month = tonumber(monthstr)
-		day = tonumber(daystr)
-		if (year == nil) or (month == nil) or (day == nil) then
-			return false;
-		end
-
-		local days_in_month = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-
-		local function is_leap_year(year)
-			return (year % 4 == 0) and ((year % 100 ~= 0) or (year % 400 == 0))
-		end
-
-		function get_days_in_month(month, year)
-			if (month == 2) and is_leap_year(year) then
-				return 29
-			else
-				return days_in_month[month]
-			end
-		end
-		if (year < 2015) then
-			return false
-		end
-		if ((month == 0) or (month > 12)) then
-			return false
-		end
-		if ((day == 0) or (day > get_days_in_month(month, year))) then
-			return false
-		end
-		return true
-	end
-	return false
-end
-
-function unique(val)
-	return true
-end
diff --git a/modules/luci-base/luasrc/model/firewall.lua b/modules/luci-base/luasrc/model/firewall.lua
deleted file mode 100644
index feff0855c..000000000
--- a/modules/luci-base/luasrc/model/firewall.lua
+++ /dev/null
@@ -1,568 +0,0 @@
--- Copyright 2009 Jo-Philipp Wich <jow@openwrt.org>
--- Licensed to the public under the Apache License 2.0.
-
-local type, pairs, ipairs, table, luci, math
-	= type, pairs, ipairs, table, luci, math
-
-local tpl = require "luci.template.parser"
-local utl = require "luci.util"
-local uci = require "luci.model.uci"
-
-module "luci.model.firewall"
-
-
-local uci_r, uci_s
-
-function _valid_id(x)
-	return (x and #x > 0 and x:match("^[a-zA-Z0-9_]+$"))
-end
-
-function _get(c, s, o)
-	return uci_r:get(c, s, o)
-end
-
-function _set(c, s, o, v)
-	if v ~= nil then
-		if type(v) == "boolean" then v = v and "1" or "0" end
-		return uci_r:set(c, s, o, v)
-	else
-		return uci_r:delete(c, s, o)
-	end
-end
-
-
-function init(cursor)
-	uci_r = cursor or uci_r or uci.cursor()
-	uci_s = uci_r:substate()
-
-	return _M
-end
-
-function save(self, ...)
-	uci_r:save(...)
-	uci_r:load(...)
-end
-
-function commit(self, ...)
-	uci_r:commit(...)
-	uci_r:load(...)
-end
-
-function get_defaults()
-	return defaults()
-end
-
-function new_zone(self)
-	local name = "newzone"
-	local count = 1
-
-	while self:get_zone(name) do
-		count = count + 1
-		name = "newzone%d" % count
-	end
-
-	return self:add_zone(name)
-end
-
-function add_zone(self, n)
-	if _valid_id(n) and not self:get_zone(n) then
-		local d = defaults()
-		local z = uci_r:section("firewall", "zone", nil, {
-			name    = n,
-			network = " ",
-			input   = d:input()   or "DROP",
-			forward = d:forward() or "DROP",
-			output  = d:output()  or "DROP"
-		})
-
-		return z and zone(z)
-	end
-end
-
-function get_zone(self, n)
-	if uci_r:get("firewall", n) == "zone" then
-		return zone(n)
-	else
-		local z
-		uci_r:foreach("firewall", "zone",
-			function(s)
-				if n and s.name == n then
-					z = s['.name']
-					return false
-				end
-			end)
-		return z and zone(z)
-	end
-end
-
-function get_zones(self)
-	local zones = { }
-	local znl = { }
-
-	uci_r:foreach("firewall", "zone",
-		function(s)
-			if s.name then
-				znl[s.name] = zone(s['.name'])
-			end
-		end)
-
-	local z
-	for z in utl.kspairs(znl) do
-		zones[#zones+1] = znl[z]
-	end
-
-	return zones
-end
-
-function get_zone_by_network(self, net)
-	local z
-
-	uci_r:foreach("firewall", "zone",
-		function(s)
-			if s.name and net then
-				local n
-				for n in utl.imatch(s.network or s.name) do
-					if n == net then
-						z = s['.name']
-						return false
-					end
-				end
-			end
-		end)
-
-	return z and zone(z)
-end
-
-function del_zone(self, n)
-	local r = false
-
-	if uci_r:get("firewall", n) == "zone" then
-		local z = uci_r:get("firewall", n, "name")
-		r = uci_r:delete("firewall", n)
-		n = z
-	else
-		uci_r:foreach("firewall", "zone",
-			function(s)
-				if n and s.name == n then
-					r = uci_r:delete("firewall", s['.name'])
-					return false
-				end
-			end)
-	end
-
-	if r then
-		uci_r:foreach("firewall", "rule",
-			function(s)
-				if s.src == n or s.dest == n then
-					uci_r:delete("firewall", s['.name'])
-				end
-			end)
-
-		uci_r:foreach("firewall", "redirect",
-			function(s)
-				if s.src == n or s.dest == n then
-					uci_r:delete("firewall", s['.name'])
-				end
-			end)
-
-		uci_r:foreach("firewall", "forwarding",
-			function(s)
-				if s.src == n or s.dest == n then
-					uci_r:delete("firewall", s['.name'])
-				end
-			end)
-	end
-
-	return r
-end
-
-function rename_zone(self, old, new)
-	local r = false
-
-	if _valid_id(new) and not self:get_zone(new) then
-		uci_r:foreach("firewall", "zone",
-			function(s)
-				if old and s.name == old then
-					if not s.network then
-						uci_r:set("firewall", s['.name'], "network", old)
-					end
-					uci_r:set("firewall", s['.name'], "name", new)
-					r = true
-					return false
-				end
-			end)
-
-		if r then
-			uci_r:foreach("firewall", "rule",
-				function(s)
-					if s.src == old then
-						uci_r:set("firewall", s['.name'], "src", new)
-					end
-					if s.dest == old then
-						uci_r:set("firewall", s['.name'], "dest", new)
-					end
-				end)
-
-			uci_r:foreach("firewall", "redirect",
-				function(s)
-					if s.src == old then
-						uci_r:set("firewall", s['.name'], "src", new)
-					end
-					if s.dest == old then
-						uci_r:set("firewall", s['.name'], "dest", new)
-					end
-				end)
-
-			uci_r:foreach("firewall", "forwarding",
-				function(s)
-					if s.src == old then
-						uci_r:set("firewall", s['.name'], "src", new)
-					end
-					if s.dest == old then
-						uci_r:set("firewall", s['.name'], "dest", new)
-					end
-				end)
-		end
-	end
-
-	return r
-end
-
-function del_network(self, net)
-	local z
-	if net then
-		for _, z in ipairs(self:get_zones()) do
-			z:del_network(net)
-		end
-	end
-end
-
-
-defaults = utl.class()
-function defaults.__init__(self)
-	uci_r:foreach("firewall", "defaults",
-		function(s)
-			self.sid  = s['.name']
-			return false
-		end)
-
-	self.sid = self.sid or uci_r:section("firewall", "defaults", nil, { })
-end
-
-function defaults.get(self, opt)
-	return _get("firewall", self.sid, opt)
-end
-
-function defaults.set(self, opt, val)
-	return _set("firewall", self.sid, opt, val)
-end
-
-function defaults.syn_flood(self)
-	return (self:get("syn_flood") == "1")
-end
-
-function defaults.drop_invalid(self)
-	return (self:get("drop_invalid") == "1")
-end
-
-function defaults.input(self)
-	return self:get("input") or "DROP"
-end
-
-function defaults.forward(self)
-	return self:get("forward") or "DROP"
-end
-
-function defaults.output(self)
-	return self:get("output") or "DROP"
-end
-
-
-zone = utl.class()
-function zone.__init__(self, z)
-	if uci_r:get("firewall", z) == "zone" then
-		self.sid  = z
-		self.data = uci_r:get_all("firewall", z)
-	else
-		uci_r:foreach("firewall", "zone",
-			function(s)
-				if s.name == z then
-					self.sid  = s['.name']
-					self.data = s
-					return false
-				end
-			end)
-	end
-end
-
-function zone.get(self, opt)
-	return _get("firewall", self.sid, opt)
-end
-
-function zone.set(self, opt, val)
-	return _set("firewall", self.sid, opt, val)
-end
-
-function zone.masq(self)
-	return (self:get("masq") == "1")
-end
-
-function zone.name(self)
-	return self:get("name")
-end
-
-function zone.network(self)
-	return self:get("network")
-end
-
-function zone.input(self)
-	return self:get("input") or defaults():input() or "DROP"
-end
-
-function zone.forward(self)
-	return self:get("forward") or defaults():forward() or "DROP"
-end
-
-function zone.output(self)
-	return self:get("output") or defaults():output() or "DROP"
-end
-
-function zone.add_network(self, net)
-	if uci_r:get("network", net) == "interface" then
-		local nets = { }
-
-		local n
-		for n in utl.imatch(self:get("network") or self:get("name")) do
-			if n ~= net then
-				nets[#nets+1] = n
-			end
-		end
-
-		nets[#nets+1] = net
-
-		_M:del_network(net)
-		self:set("network", table.concat(nets, " "))
-	end
-end
-
-function zone.del_network(self, net)
-	local nets = { }
-
-	local n
-	for n in utl.imatch(self:get("network") or self:get("name")) do
-		if n ~= net then
-			nets[#nets+1] = n
-		end
-	end
-
-	if #nets > 0 then
-		self:set("network", table.concat(nets, " "))
-	else
-		self:set("network", " ")
-	end
-end
-
-function zone.get_networks(self)
-	local nets = { }
-
-	local n
-	for n in utl.imatch(self:get("network") or self:get("name")) do
-		nets[#nets+1] = n
-	end
-
-	return nets
-end
-
-function zone.clear_networks(self)
-	self:set("network", " ")
-end
-
-function zone.get_forwardings_by(self, what)
-	local name = self:name()
-	local forwards = { }
-
-	uci_r:foreach("firewall", "forwarding",
-		function(s)
-			if s.src and s.dest and s[what] == name then
-				forwards[#forwards+1] = forwarding(s['.name'])
-			end
-		end)
-
-	return forwards
-end
-
-function zone.add_forwarding_to(self, dest)
-	local exist, forward
-
-	for _, forward in ipairs(self:get_forwardings_by('src')) do
-		if forward:dest() == dest then
-			exist = true
-			break
-		end
-	end
-
-	if not exist and dest ~= self:name() and _valid_id(dest) then
-		local s = uci_r:section("firewall", "forwarding", nil, {
-			src     = self:name(),
-			dest    = dest
-		})
-
-		return s and forwarding(s)
-	end
-end
-
-function zone.add_forwarding_from(self, src)
-	local exist, forward
-
-	for _, forward in ipairs(self:get_forwardings_by('dest')) do
-		if forward:src() == src then
-			exist = true
-			break
-		end
-	end
-
-	if not exist and src ~= self:name() and _valid_id(src) then
-		local s = uci_r:section("firewall", "forwarding", nil, {
-			src     = src,
-			dest    = self:name()
-		})
-
-		return s and forwarding(s)
-	end
-end
-
-function zone.del_forwardings_by(self, what)
-	local name = self:name()
-
-	uci_r:delete_all("firewall", "forwarding",
-		function(s)
-			return (s.src and s.dest and s[what] == name)
-		end)
-end
-
-function zone.add_redirect(self, options)
-	options = options or { }
-	options.src = self:name()
-
-	local s = uci_r:section("firewall", "redirect", nil, options)
-	return s and redirect(s)
-end
-
-function zone.add_rule(self, options)
-	options = options or { }
-	options.src = self:name()
-
-	local s = uci_r:section("firewall", "rule", nil, options)
-	return s and rule(s)
-end
-
-function zone.get_color(self)
-	if self and self:name() == "lan" then
-		return "#90f090"
-	elseif self and self:name() == "wan" then
-		return "#f09090"
-	elseif self then
-		math.randomseed(tpl.hash(self:name()))
-
-		local r   = math.random(128)
-		local g   = math.random(128)
-		local min = 0
-		local max = 128
-
-		if ( r + g ) < 128 then
-			min = 128 - r - g
-		else
-			max = 255 - r - g
-		end
-
-		local b = min + math.floor( math.random() * ( max - min ) )
-
-		return "#%02x%02x%02x" % { 0xFF - r, 0xFF - g, 0xFF - b }
-	else
-		return "#eeeeee"
-	end
-end
-
-
-forwarding = utl.class()
-function forwarding.__init__(self, f)
-	self.sid = f
-end
-
-function forwarding.src(self)
-	return uci_r:get("firewall", self.sid, "src")
-end
-
-function forwarding.dest(self)
-	return uci_r:get("firewall", self.sid, "dest")
-end
-
-function forwarding.src_zone(self)
-	local z = zone(self:src())
-	return z.sid and z
-end
-
-function forwarding.dest_zone(self)
-	local z = zone(self:dest())
-	return z.sid and z
-end
-
-
-rule = utl.class()
-function rule.__init__(self, f)
-	self.sid = f
-end
-
-function rule.get(self, opt)
-	return _get("firewall", self.sid, opt)
-end
-
-function rule.set(self, opt, val)
-	return _set("firewall", self.sid, opt, val)
-end
-
-function rule.src(self)
-	return uci_r:get("firewall", self.sid, "src")
-end
-
-function rule.dest(self)
-	return uci_r:get("firewall", self.sid, "dest")
-end
-
-function rule.src_zone(self)
-	return zone(self:src())
-end
-
-function rule.dest_zone(self)
-	return zone(self:dest())
-end
-
-
-redirect = utl.class()
-function redirect.__init__(self, f)
-	self.sid = f
-end
-
-function redirect.get(self, opt)
-	return _get("firewall", self.sid, opt)
-end
-
-function redirect.set(self, opt, val)
-	return _set("firewall", self.sid, opt, val)
-end
-
-function redirect.src(self)
-	return uci_r:get("firewall", self.sid, "src")
-end
-
-function redirect.dest(self)
-	return uci_r:get("firewall", self.sid, "dest")
-end
-
-function redirect.src_zone(self)
-	return zone(self:src())
-end
-
-function redirect.dest_zone(self)
-	return zone(self:dest())
-end
diff --git a/modules/luci-base/luasrc/view/cbi/browser.htm b/modules/luci-base/luasrc/view/cbi/browser.htm
deleted file mode 100644
index eb47ffafe..000000000
--- a/modules/luci-base/luasrc/view/cbi/browser.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<%+cbi/valueheader%>
-
-<input class="cbi-input-text" type="text"<%=
-	attr("id", cbid) ..
-	attr("name", cbid) ..
-	attr("value", self:cfgvalue(section) or self.default) ..
-	attr("data-browser", self.default_path or "")
-%> />
-
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/button.htm b/modules/luci-base/luasrc/view/cbi/button.htm
deleted file mode 100644
index 6ccba58f2..000000000
--- a/modules/luci-base/luasrc/view/cbi/button.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<%+cbi/valueheader%>
-	<% if self:cfgvalue(section) ~= false then %>
-		<input class="cbi-button cbi-button-<%=self.inputstyle or "button" %>" type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> />
-	<% else %>
-		-
-	<% end %>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm b/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm
deleted file mode 100644
index bdd6bc968..000000000
--- a/modules/luci-base/luasrc/view/cbi/cell_valuefooter.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-</div>
-</div>
diff --git a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm b/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
deleted file mode 100644
index 4b7095754..000000000
--- a/modules/luci-base/luasrc/view/cbi/cell_valueheader.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<%-
-	local title = luci.util.trim(striptags(self.title))
-	local descr = luci.util.trim(striptags(self.description))
-	local ftype = self.typename or (self.template and self.template:gsub("^.+/", ""))
--%>
-<div class="td cbi-value-field<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.password then %> nowrap<% end %>"<%=
-	attr("data-name", self.option) ..
-	ifattr(ftype and #ftype > 0, "data-type", ftype) ..
-	ifattr(title and #title > 0, "data-title", title, true) ..
-	ifattr(descr and #descr > 0, "data-description", descr, true)
-%>>
-<div id="cbi-<%=self.config.."-"..section.."-"..self.option%>" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>">
diff --git a/modules/luci-base/luasrc/view/cbi/compound.htm b/modules/luci-base/luasrc/view/cbi/compound.htm
deleted file mode 100644
index 12d02bb1d..000000000
--- a/modules/luci-base/luasrc/view/cbi/compound.htm
+++ /dev/null
@@ -1 +0,0 @@
-<%- self:render_children() %>
diff --git a/modules/luci-base/luasrc/view/cbi/delegator.htm b/modules/luci-base/luasrc/view/cbi/delegator.htm
deleted file mode 100644
index 4fd19265d..000000000
--- a/modules/luci-base/luasrc/view/cbi/delegator.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<%- self.active:render() %>
-	<div class="cbi-page-actions">
-		<input type="hidden" name="cbi.delg.current" value="<%=self.current%>" />
-<% for _, x in ipairs(self.chain) do %>
-		<input type="hidden" name="cbi.delg.path" value="<%=x%>" />
-<% end %>
-<% if not self.disallow_pageactions then %>
-<% if self.allow_finish and not self:get_next(self.current) then %>
-	<input class="cbi-button cbi-button-finish" type="submit" value="<%:Finish%>" />
-<% elseif self:get_next(self.current) then %>
-		<input class="cbi-button cbi-button-next" type="submit" value="<%:Next »%>" />
-<% end %>
-<% if self.allow_cancel then %>
-		<input class="cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:Cancel%>" />
-<% end %>
-<% if self.allow_reset then %>
-		<input class="cbi-button cbi-button-reset" type="reset" value="<%:Reset%>" />
-<% end %>
-<% if self.allow_back and self:get_prev(self.current) then %>
-		<input class="cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:« Back%>" />
-<% end %>
-<% end %>
-		<script type="text/javascript">cbi_d_update();</script>
-	</div>
diff --git a/modules/luci-base/luasrc/view/cbi/dropdown.htm b/modules/luci-base/luasrc/view/cbi/dropdown.htm
deleted file mode 100644
index 927ecf239..000000000
--- a/modules/luci-base/luasrc/view/cbi/dropdown.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<%+cbi/valueheader%>
-<div<%=attr("data-ui-widget", luci.util.serialize_json({
-	"Dropdown", self:cfgvalue(section) or self.default, self:choices(), {
-		id = cbid,
-		name = cbid,
-		sort = self.keylist,
-		multiple = self.multiple,
-		datatype = self.datatype,
-		optional = self.optional or self.rmempty,
-		readonly = self.readonly,
-		maxlength = self.maxlength,
-		placeholder = self.placeholder,
-		display_items = self.display or self.size or 3,
-		dropdown_items = self.dropdown or self.display or self.size or 5,
-		custom_placeholder = self.custom or
-			(self.multiple and translate("Enter custom values") or translate("Enter custom value"))
-	}
-}))%>></div>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/dvalue.htm b/modules/luci-base/luasrc/view/cbi/dvalue.htm
deleted file mode 100644
index 78e6f323d..000000000
--- a/modules/luci-base/luasrc/view/cbi/dvalue.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<%+cbi/valueheader%>
-<% if self.href then %><a href="<%=self.href%>"><% end -%>
-	<%
-		local val = self:cfgvalue(section) or self.default or ""
-		if not self.rawhtml then
-			write(pcdata(val))
-		else
-			write(val)
-		end
-	%>
-<%- if self.href then %></a><%end%>
-<input type="hidden" id="<%=cbid%>" value="<%=pcdata(self:cfgvalue(section) or self.default or "")%>" />
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/dynlist.htm b/modules/luci-base/luasrc/view/cbi/dynlist.htm
deleted file mode 100644
index 2a3da67ff..000000000
--- a/modules/luci-base/luasrc/view/cbi/dynlist.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<%+cbi/valueheader%>
-<div<%=attr("data-ui-widget", luci.util.serialize_json({
-	"DynamicList", self:cfgvalue(section) or self.default, self:choices(), {
-		name = cbid,
-		size = self.size,
-		sort = self.keylist,
-		datatype = self.datatype,
-		optional = self.optional or self.rmempty,
-		placeholder = self.placeholder
-	}
-}))%>></div>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/error.htm b/modules/luci-base/luasrc/view/cbi/error.htm
deleted file mode 100644
index 75ec1082a..000000000
--- a/modules/luci-base/luasrc/view/cbi/error.htm
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="cbi-map" id="cbi-<%=self.config%>">
-	<% if self.title and #self.title > 0 then %><h2 name="content"><%=self.title%></h2><% end %>
-	<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
-
-	<p class="alert-message danger">
-		<%: The configuration file could not be loaded due to the following error: %><br />
-		<code><%=pcdata(self.error)%></code>
-	</p>
-
-	<textarea name="cbi.source" style="width:100%; margin-bottom:1em" rows="<%=math.max(self.source:cmatch("\n"), 10)%>"><%=pcdata(self.source)%></textarea>
-
-	<p class="alert-message">
-		<%: Edit the raw configuration data above to fix any error and hit "Save" to reload the page. %>
-	</p>
-
-	<div class="cbi-page-actions">
-		<input class="cbi-button cbi-button-apply" type="submit" name="cbi.save" value="<%:Save%>" />
-	</div>
-</div>
diff --git a/modules/luci-base/luasrc/view/cbi/footer.htm b/modules/luci-base/luasrc/view/cbi/footer.htm
deleted file mode 100644
index ed632202c..000000000
--- a/modules/luci-base/luasrc/view/cbi/footer.htm
+++ /dev/null
@@ -1,41 +0,0 @@
-<%
-	local display_back  = (redirect and not flow.hidebackbtn)
-	local display_skip  = (flow.skip)
-	local display_apply = (not autoapply and not flow.hideapplybtn)
-	local display_save  = (not flow.hidesavebtn)
-	local display_reset = (not flow.hideresetbtn)
-
-	if pageaction and
-	   (display_back or display_skip or display_apply or display_save or display_reset)
-	then
-		%><div class="cbi-page-actions"><%
-
-		if display_back then
-			%><input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" /> <%
-		end
-
-		if display_skip then
-			%><input class="cbi-button cbi-button-skip" type="button" value="<%:Skip%>" onclick="cbi_submit(this, 'cbi.skip')" /> <%
-		end
-
-		if display_apply then
-			%><input class="cbi-button cbi-button-apply" type="button" value="<%:Save & Apply%>" onclick="cbi_submit(this, 'cbi.apply')" /> <%
-		end
-
-		if display_save then
-			%><input class="cbi-button cbi-button-save" type="submit" value="<%:Save%>" /> <%
-		end
-
-		if display_reset then
-			%><input class="cbi-button cbi-button-reset" type="button" value="<%:Reset%>" onclick="location.href='<%=REQUEST_URI%>'" /> <%
-		end
-
-		%></div><%
-	end
-%>
-
-</form>
-
-<script type="text/javascript">cbi_init();</script>
-
-<%+footer%>
diff --git a/modules/luci-base/luasrc/view/cbi/full_valuefooter.htm b/modules/luci-base/luasrc/view/cbi/full_valuefooter.htm
deleted file mode 100644
index d4ad093ef..000000000
--- a/modules/luci-base/luasrc/view/cbi/full_valuefooter.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-		<% if self.description and #self.description > 0 then -%>
-			<% if not luci.util.instanceof(self, luci.cbi.DynamicList) and (not luci.util.instanceof(self, luci.cbi.Flag) or self.orientation == "horizontal") then -%>
-				<br />
-			<%- end %>
-			<div class="cbi-value-description">
-				<%=self.description%>
-			</div>
-		<%- end %>
-	<%- if self.title and #self.title > 0 then -%>
-	</div>
-	<%- end -%>
-</div>
diff --git a/modules/luci-base/luasrc/view/cbi/full_valueheader.htm b/modules/luci-base/luasrc/view/cbi/full_valueheader.htm
deleted file mode 100644
index 1d9ebeba9..000000000
--- a/modules/luci-base/luasrc/view/cbi/full_valueheader.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="cbi-value<% if self.error and self.error[section] then %> cbi-value-error<% end %><% if self.last_child then %> cbi-value-last<% end %><% if self.password then %> nowrap<% end %>" id="cbi-<%=self.config.."-"..section.."-"..self.option%>" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>">
-	<%- if self.title and #self.title > 0 then -%>
-	<label class="cbi-value-title"<%= attr("for", cbid) %>>
-	<%- if self.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=self.titleref%>"><%- end -%>
-		<%-=self.title-%>
-	<%- if self.titleref then -%></a><%- end -%>
-	</label>
-		<div class="cbi-value-field">
-	<%- end -%>
diff --git a/modules/luci-base/luasrc/view/cbi/fvalue.htm b/modules/luci-base/luasrc/view/cbi/fvalue.htm
deleted file mode 100644
index 7f975b95e..000000000
--- a/modules/luci-base/luasrc/view/cbi/fvalue.htm
+++ /dev/null
@@ -1,12 +0,0 @@
-<%+cbi/valueheader%>
-<div<%=attr("data-ui-widget", luci.util.serialize_json({
-	"Checkbox", self:cfgvalue(section) or self.default, {
-		id = cbid,
-		name = cbid,
-		readonly = self.readonly,
-		hiddenname = "cbi.cbe." .. self.config .. "." .. section .. "." .. self.option,
-		value_enabled = self.enabled or 1,
-		value_disabled = self.disabled or 0
-	}
-}))%>></div>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/header.htm b/modules/luci-base/luasrc/view/cbi/header.htm
deleted file mode 100644
index 821fa3efa..000000000
--- a/modules/luci-base/luasrc/view/cbi/header.htm
+++ /dev/null
@@ -1,18 +0,0 @@
-<%+header%>
-<form method="post" name="cbi" action="<%=REQUEST_URI%>" enctype="multipart/form-data" onreset="return cbi_validate_reset(this)" onsubmit="return cbi_validate_form(this, '<%:Some fields are invalid, cannot save values!%>')"<%=
-	attr("data-strings", luci.util.serialize_json({
-		label = {
-			choose = translate('-- Please choose --'),
-			custom = translate('-- custom --'),
-		},
-		path = {
-			resource = resource,
-			browser  = url("admin/filebrowser")
-		}
-	}))
-%>>
-	<div>
-		<input type="hidden" name="token" value="<%=token%>" />
-		<input type="hidden" name="cbi.submit" value="1" />
-		<input type="submit" value="<%:Save%>" class="hidden" />
-	</div>
diff --git a/modules/luci-base/luasrc/view/cbi/ipaddr.htm b/modules/luci-base/luasrc/view/cbi/ipaddr.htm
deleted file mode 100644
index 1c924e154..000000000
--- a/modules/luci-base/luasrc/view/cbi/ipaddr.htm
+++ /dev/null
@@ -1,27 +0,0 @@
-<%+cbi/valueheader%>
-	<script type="text/javascript">
-		function switchToCIDRList(ev) {
-			var input = ev.target.previousElementSibling,
-			    usecidr = document.getElementById(input.id + '_usecidr');
-
-			ev.preventDefault();
-
-			usecidr.value = '1';
-			cbi_d_update();
-		}
-	</script>
-	<input data-update="change"<%=
-		attr("id", cbid) ..
-		attr("name", cbid) ..
-		attr("type", "text") ..
-		attr("class", "cbi-input-text") ..
-		attr("value", self:cfgvalue(section) or self.default) ..
-		ifattr(self.size, "size") ..
-		ifattr(self.placeholder, "placeholder") ..
-		ifattr(self.datatype, "data-type", self.datatype) ..
-		ifattr(self.datatype, "data-optional", self.optional or self.rmempty) ..
-		ifattr(self.combobox_manual, "data-manual", self.combobox_manual) ..
-		ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist })
-	%> /><!--
-	--><button class="cbi-button cbi-button-neutral" title="<%:Switch to CIDR list notation%>" aria-label="<%:Switch to CIDR list notation%>" onclick="switchToCIDRList(event)">…</button>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/lvalue.htm b/modules/luci-base/luasrc/view/cbi/lvalue.htm
deleted file mode 100644
index 28141472f..000000000
--- a/modules/luci-base/luasrc/view/cbi/lvalue.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<%+cbi/valueheader%>
-<div<%=attr("data-ui-widget", luci.util.serialize_json({
-	"Select", self:cfgvalue(section) or self.default, self:choices(), {
-		id = cbid,
-		name = cbid,
-		size = self.size,
-		sort = self.keylist,
-		widget = self.widget,
-		datatype = self.datatype,
-		optional = self.optional,
-		placeholder = self.placeholder
-	}
-}))%>></div>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/map.htm b/modules/luci-base/luasrc/view/cbi/map.htm
deleted file mode 100644
index cda4d3530..000000000
--- a/modules/luci-base/luasrc/view/cbi/map.htm
+++ /dev/null
@@ -1,40 +0,0 @@
-<%- if firstmap and messages then local msg; for _, msg in ipairs(messages) do -%>
-	<div class="alert-message warning"><%=pcdata(msg)%></div>
-<%- end end -%>
-
-<div class="cbi-map" id="cbi-<%=self.config%>">
-	<% if self.title and #self.title > 0 then %>
-		<h2 name="content"><%=self.title%></h2>
-	<% end %>
-	<% if self.description and #self.description > 0 then %>
-		<div class="cbi-map-descr"><%=self.description%></div>
-	<% end %>
-	<% if self.tabbed then %>
-		<div>
-			<% for i, section in ipairs(self.children) do
-			       tab = section.section or section.sectiontype %>
-				<div class="cbi-tabcontainer"<%=
-					attr("id", "container.m-%s.%s" %{ self.config, tab }) ..
-					attr("data-tab", tab) ..
-					attr("data-tab-title", section.title or tab)
-				%>>
-					<% section:render() %>
-				</div>
-			<% end %>
-		</div>
-
-		<% if not self.save then -%>
-			<div class="cbi-section-error">
-				<% for _, section in ipairs(self.children) do %>
-					<% if section.error and section.error[section.section] then -%>
-						<ul><li>
-							<%:One or more invalid/required values on tab%>:&nbsp;<%=section.title or section.section or section.sectiontype%>
-						</li></ul>
-					<%- end %>
-				<% end %>
-			</div>
-		<%- end %>
-	<% else %>
-		<%- self:render_children() %>
-	<% end %>
-</div>
diff --git a/modules/luci-base/luasrc/view/cbi/mvalue.htm b/modules/luci-base/luasrc/view/cbi/mvalue.htm
deleted file mode 100644
index 1f4f4dbcc..000000000
--- a/modules/luci-base/luasrc/view/cbi/mvalue.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<%+cbi/valueheader%>
-<%
-	local util = require "luci.util"
-	local values = {}
-	local value
-	for value in util.imatch(self:cfgvalue(section) or self.default) do
-		values[#values+1] = value
-	end
-%>
-<div<%=attr("data-ui-widget", luci.util.serialize_json({
-	"Select", values, self:choices(), {
-		id = cbid,
-		name = cbid,
-		size = self.size,
-		sort = self.keylist,
-		multiple = true,
-		widget = self.widget,
-		datatype = self.datatype,
-		optional = self.optional or self.rmempty,
-		readonly = self.readonly,
-		placeholder = self.placeholder
-	}
-}))%>></div>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/nsection.htm b/modules/luci-base/luasrc/view/cbi/nsection.htm
deleted file mode 100644
index 14232e3d9..000000000
--- a/modules/luci-base/luasrc/view/cbi/nsection.htm
+++ /dev/null
@@ -1,29 +0,0 @@
-<% if self:cfgvalue(self.section) then section = self.section %>
-	<div class="cbi-section">
-		<% if self.title and #self.title > 0 then -%>
-			<legend><%=self.title%></legend>
-		<%- end %>
-		<% if self.description and #self.description > 0 then -%>
-			<div class="cbi-section-descr"><%=self.description%></div>
-		<%- end %>
-		<% if self.addremove then -%>
-			<div class="cbi-section-remove right">
-				<input type="submit" class="cbi-button" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:Delete%>" />
-			</div>
-		<%- end %>
-		<div class="cbi-section-node<% if self.tabs then %> cbi-section-node-tabbed<% end %>" id="cbi-<%=self.config%>-<%=section%>">
-			<%+cbi/ucisection%>
-		</div>
-	</div>
-<% elseif self.addremove then %>
-	<% if self.template_addremove then include(self.template_addremove) else -%>
-	<div class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>">
-		<% if self.title and #self.title > 0 then -%>
-			<legend><%=self.title%></legend>
-		<%- end %>
-		<div class="cbi-section-descr"><%=self.description%></div>
-		<input type="submit" class="cbi-button cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:Add%>" />
-	</div>
-	<%- end %>
-<% end %>
-<!-- /nsection -->
diff --git a/modules/luci-base/luasrc/view/cbi/nullsection.htm b/modules/luci-base/luasrc/view/cbi/nullsection.htm
deleted file mode 100644
index 7230719d1..000000000
--- a/modules/luci-base/luasrc/view/cbi/nullsection.htm
+++ /dev/null
@@ -1,37 +0,0 @@
-<div class="cbi-section">
-	<% if self.title and #self.title > 0 then -%>
-		<legend><%=self.title%></legend>
-	<%- end %>
-	<% if self.description and #self.description > 0 then -%>
-		<div class="cbi-section-descr"><%=self.description%></div>
-	<%- end %>
-	<div class="cbi-section-node">
-		<div id="cbi-<%=self.config%>-<%=tostring(self):sub(8)%>">
-			<% self:render_children(1, scope or {}) %>
-		</div>
-		<% if self.error and self.error[1] then -%>
-			<div class="cbi-section-error">
-				<ul><% for _, e in ipairs(self.error[1]) do -%>
-					<li>
-						<%- if e == "invalid" then -%>
-							<%:One or more fields contain invalid values!%>
-						<%- elseif e == "missing" then -%>
-							<%:One or more required fields have no value!%>
-						<%- else -%>
-							<%=pcdata(e)%>
-						<%- end -%>
-					</li>
-				<%- end %></ul>
-			</div>
-		<%- end %>
-	</div>
-</div>
-<%-
-	if type(self.hidden) == "table" then
-		for k, v in pairs(self.hidden) do
--%>
-	<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
-<%-
-		end
-	end
-%>
diff --git a/modules/luci-base/luasrc/view/cbi/simpleform.htm b/modules/luci-base/luasrc/view/cbi/simpleform.htm
deleted file mode 100644
index 3e10724ec..000000000
--- a/modules/luci-base/luasrc/view/cbi/simpleform.htm
+++ /dev/null
@@ -1,77 +0,0 @@
-<%
-	if not self.embedded then
-		%><form method="post" enctype="multipart/form-data" action="<%=REQUEST_URI%>">
-			<input type="hidden" name="token" value="<%=token%>" />
-			<input type="hidden" name="cbi.submit" value="1" /><%
-	end
-
-	%><div class="cbi-map" id="cbi-<%=self.config%>"><%
-
-	if self.title and #self.title > 0 then
-		%><h2 name="content"><%=self.title%></h2><%
-	end
-
-	if self.description and #self.description > 0 then
-		%><div class="cbi-map-descr"><%=self.description%></div><%
-	end
-
-	self:render_children()
-
-	%></div><%
-
-	if self.message then
-		%><div class="alert-message notice"><%=self.message%></div><%
-	end
-
-	if self.errmessage then
-		%><div class="alert-message warning"><%=self.errmessage%></div><%
-	end
-
-	if not self.embedded then
-		if type(self.hidden) == "table" then
-			local k, v
-			for k, v in pairs(self.hidden) do
-				%><input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" /><%
-			end
-		end
-
-		local display_back   = (redirect)
-		local display_cancel = (self.cancel ~= false and self.on_cancel)
-		local display_skip   = (self.flow and self.flow.skip)
-		local display_submit = (self.submit ~= false)
-		local display_reset  = (self.reset ~= false)
-
-		if display_back or display_cancel or display_skip or display_submit or display_reset then
-			%><div class="cbi-page-actions"><%
-
-			if display_back then
-				%><input class="cbi-button cbi-button-link" type="button" value="<%:Back to Overview%>" onclick="location.href='<%=pcdata(redirect)%>'" /> <%
-			end
-
-			if display_cancel then
-				local label = pcdata(self.cancel or translate("Cancel"))
-				%><input class="cbi-button cbi-button-link" type="button" value="<%=label%>" onclick="cbi_submit(this, 'cbi.cancel')" /> <%
-			end
-
-			if display_skip then
-				%><input class="cbi-button cbi-button-neutral" type="button" value="<%:Skip%>" onclick="cbi_submit(this, 'cbi.skip')" /> <%
-			end
-
-			if display_submit then
-				local label = pcdata(self.submit or translate("Submit"))
-				%><input class="cbi-button cbi-button-save" type="submit" value="<%=label%>" /> <%
-			end
-
-			if display_reset then
-				local label = pcdata(self.reset or translate("Reset"))
-				%><input class="cbi-button cbi-button-reset" type="reset" value="<%=label%>" /> <%
-			end
-
-			%></div><%
-		end
-
-		%></form><%
-	end
-%>
-
-<script type="text/javascript">cbi_init();</script>
diff --git a/modules/luci-base/luasrc/view/cbi/tabcontainer.htm b/modules/luci-base/luasrc/view/cbi/tabcontainer.htm
deleted file mode 100644
index 7fcb83578..000000000
--- a/modules/luci-base/luasrc/view/cbi/tabcontainer.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<% for _, tab in ipairs(self.tab_names) do data = self.tabs[tab] %>
-	<div class="cbi-tabcontainer"<%=
-		attr("id", "container.%s.%s.%s" %{ self.config, section, tab }) ..
-		attr("data-tab", tab) ..
-		attr("data-tab-title", data.title) ..
-		attr("data-tab-active", tostring(tab == self.selected_tab))
-	%>>
-		<% if data.description then %>
-			<div class="cbi-tab-descr"><%=data.description%></div>
-		<% end %>
-
-		<% self:render_tab(tab, section, scope or {}) %>
-	</div>
-<% end %>
diff --git a/modules/luci-base/luasrc/view/cbi/tblsection.htm b/modules/luci-base/luasrc/view/cbi/tblsection.htm
deleted file mode 100644
index 11c2206d8..000000000
--- a/modules/luci-base/luasrc/view/cbi/tblsection.htm
+++ /dev/null
@@ -1,203 +0,0 @@
-<%-
-local rowcnt = 0
-
-function rowstyle()
-	rowcnt = rowcnt + 1
-	if rowcnt % 2 == 0 then
-		return " cbi-rowstyle-1"
-	else
-		return " cbi-rowstyle-2"
-	end
-end
-
-function width(o)
-	if o.width then
-		if type(o.width) == 'number' then
-			return ' style="width:%dpx"' % o.width
-		end
-		return ' style="width:%s"' % o.width
-	end
-	return ''
-end
-
-local has_titles = false
-local has_descriptions = false
-
-local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous"
-local titlename = ifattr(not self.anonymous or self.sectiontitle, "data-title", translate("Name"))
-
-local i, k
-for i, k in pairs(self.children) do
-	if not k.typename then
-		k.typename = k.template and k.template:gsub("^.+/", "") or ""
-	end
-
-	if not has_titles and k.title and #k.title > 0 then
-		has_titles = true
-	end
-
-	if not has_descriptions and k.description and #k.description > 0 then
-		has_descriptions = true
-	end
-end
-
-function render_titles()
-	if not has_titles then
-		return
-	end
-
-	%><div class="tr cbi-section-table-titles <%=anonclass%>"<%=titlename%>><%
-
-	local i, k
-	for i, k in ipairs(self.children) do
-		if not k.optional then
-			%><div class="th cbi-section-table-cell"<%=
-				width(k) .. attr('data-type', k.typename) %>><%
-
-			if k.titleref then
-				%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%
-			end
-
-			write(k.title)
-
-			if k.titleref then
-				%></a><%
-			end
-
-			%></div><%
-		end
-	end
-
-	if self.sortable or self.extedit or self.addremove then
-		%><div class="th cbi-section-table-cell cbi-section-actions"></div><%
-	end
-
-	%></div><%
-
-	rowcnt = rowcnt + 1
-end
-
-function render_descriptions()
-	if not has_descriptions then
-		return
-	end
-
-	%><div class="tr cbi-section-table-descr <%=anonclass%>"><%
-
-	local i, k
-	for i, k in ipairs(self.children) do
-		if not k.optional then
-			%><div class="th cbi-section-table-cell"<%=
-				width(k) .. attr("data-type", k.typename) %>><%
-
-			write(k.description)
-
-			%></div><%
-		end
-	end
-
-	if self.sortable or self.extedit or self.addremove then
-		%><div class="th cbi-section-table-cell cbi-section-actions"></div><%
-	end
-
-	%></div><%
-
-	rowcnt = rowcnt + 1
-end
-
--%>
-
-<!-- tblsection -->
-<div class="cbi-section cbi-tblsection" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
-	<% if self.title and #self.title > 0 then -%>
-		<h3><%=self.title%></h3>
-	<%- end %>
-	<%- if self.sortable then -%>
-		<input type="hidden" id="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" name="cbi.sts.<%=self.config%>.<%=self.sectiontype%>" value="" />
-	<%- end -%>
-	<div class="cbi-section-descr"><%=self.description%></div>
-	<div class="table cbi-section-table">
-		<%-
-			render_titles()
-			render_descriptions()
-
-			local isempty, section, i, k = true, nil, nil
-		    for i, k in ipairs(self:cfgsections()) do
-				isempty = false
-				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)
-				local colorclass = (self.extedit or self.rowcolors) and rowstyle() or ""
-				local scope = {
-					valueheader = "cbi/cell_valueheader",
-					valuefooter = "cbi/cell_valuefooter"
-				}
-		-%>
-		<div class="tr cbi-section-table-row<%=colorclass%>" id="cbi-<%=self.config%>-<%=section%>"<%=sectiontitle%>>
-			<%-
-				local node
-				for k, node in ipairs(self.children) do
-					if not node.optional then
-						node:render(section, scope or {})
-					end
-				end
-			-%>
-
-			<%- if self.sortable or self.extedit or self.addremove then -%>
-				<div class="td cbi-section-table-cell nowrap cbi-section-actions">
-					<div>
-						<%- if self.sortable then -%>
-							<input class="cbi-button cbi-button-up" type="button" value="<%:Up%>" onclick="return cbi_row_swap(this, true, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move up%>" />
-							<input class="cbi-button cbi-button-down" type="button" value="<%:Down%>" onclick="return cbi_row_swap(this, false, 'cbi.sts.<%=self.config%>.<%=self.sectiontype%>')" title="<%:Move down%>" />
-						<% end; if self.extedit then -%>
-							<input class="cbi-button cbi-button-edit" type="button" value="<%:Edit%>"
-							<%- if type(self.extedit) == "string" then
-							%> onclick="location.href='<%=self.extedit:format(section)%>'"
-							<%- elseif type(self.extedit) == "function" then
-							%> onclick="location.href='<%=self:extedit(section)%>'"
-							<%- end
-							%> alt="<%:Edit%>" title="<%:Edit%>" />
-						<% end; if self.addremove then %>
-							<input class="cbi-button cbi-button-remove" type="submit" value="<%:Delete%>"  onclick="this.form.cbi_state='del-section'; return true" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" />
-						<%- end -%>
-					</div>
-				</div>
-			<%- end -%>
-		</div>
-		<%- end -%>
-
-		<%- if isempty then -%>
-		<div class="tr cbi-section-table-row placeholder">
-			<div class="td"><em><%:This section contains no values yet%></em></div>
-		</div>
-		<%- end -%>
-	</div>
-
-	<% if self.error then %>
-		<div class="cbi-section-error">
-			<ul><% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%>
-				<li><%=pcdata(e):gsub("\n","<br />")%></li>
-			<%- end end %></ul>
-		</div>
-	<% end %>
-
-	<%- if self.addremove then -%>
-		<% if self.template_addremove then include(self.template_addremove) else -%>
-		<div class="cbi-section-create cbi-tblsection-create">
-			<% if self.anonymous then %>
-				<input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" title="<%:Add%>" />
-			<% else %>
-				<% if self.invalid_cts then -%>
-					<div class="cbi-section-error"><%:Invalid%></div>
-				<%- end %>
-				<div>
-					<input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" data-type="uciname" data-optional="true" />
-				</div>
-				<input class="cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" />
-			<% end %>
-		</div>
-		<%- end %>
-	<%- end -%>
-</div>
-<!-- /tblsection -->
diff --git a/modules/luci-base/luasrc/view/cbi/tsection.htm b/modules/luci-base/luasrc/view/cbi/tsection.htm
deleted file mode 100644
index 8f3b7f0ff..000000000
--- a/modules/luci-base/luasrc/view/cbi/tsection.htm
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
-	<% if self.title and #self.title > 0 then -%>
-		<legend><%=self.title%></legend>
-	<%- end %>
-	<% if self.error_msg and #self.error_msg > 0 then -%>
-		<div class="cbi-section-error">
-			<%=self.error_msg%>
-		</div>
-	<%- end %>
-	<% if self.description and #self.description > 0 then -%>
-		<div class="cbi-section-descr"><%=self.description%></div>
-	<%- end %>
-	<% local isempty = true for i, k in ipairs(self:cfgsections()) do -%>
-		<% if self.addremove then -%>
-			<div class="cbi-section-remove right">
-				<input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" onclick="this.form.cbi_state='del-section'; return true" value="<%:Delete%>" class="cbi-button" />
-			</div>
-		<%- end %>
-
-		<%- section = k; isempty = false -%>
-
-		<% if not self.anonymous then -%>
-			<h3><%=section:upper()%></h3>
-		<%- end %>
-
-		<div class="cbi-section-node<% if self.tabs then %> cbi-section-node-tabbed<% end %>" id="cbi-<%=self.config%>-<%=section%>">
-			<%+cbi/ucisection%>
-		</div>
-	<%- end %>
-
-	<% if isempty then -%>
-		<em><%:This section contains no values yet%><br /><br /></em>
-	<%- end %>
-
-	<% if self.addremove then -%>
-		<% if self.template_addremove then include(self.template_addremove) else -%>
-		<div class="cbi-section-create">
-			<% if self.anonymous then -%>
-				<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>.<%=section%>" value="<%:Add%>" />
-			<%- else -%>
-				<% if self.invalid_cts then -%>
-					<div class="cbi-section-error"><%:Invalid%></div>
-				<%- end %>
-				<div>
-					<input type="text" class="cbi-section-create-name" id="cbi.cts.<%=self.config%>.<%=self.sectiontype%>." name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>." data-type="uciname" data-optional="true" />
-				</div>
-				<input class="cbi-button cbi-button-add" type="submit" onclick="this.form.cbi_state='add-section'; return true" value="<%:Add%>" title="<%:Add%>" />
-			<%- end %>
-		</div>
-		<%- end %>
-	<%- end %>
-</div>
diff --git a/modules/luci-base/luasrc/view/cbi/tvalue.htm b/modules/luci-base/luasrc/view/cbi/tvalue.htm
deleted file mode 100644
index f3b12bd09..000000000
--- a/modules/luci-base/luasrc/view/cbi/tvalue.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<%+cbi/valueheader%>
-	<textarea class="cbi-input-textarea" <% if not self.size then %> style="width: 100%"<% else %> cols="<%=self.size%>"<% end %> data-update="change"<%= attr("name", cbid) .. attr("id", cbid) .. ifattr(self.rows, "rows") .. ifattr(self.wrap, "wrap")  .. ifattr(self.readonly, "readonly") %>>
-	<%-=pcdata(self:cfgvalue(section) or self.default)-%>
-	</textarea>
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/ucisection.htm b/modules/luci-base/luasrc/view/cbi/ucisection.htm
deleted file mode 100644
index 8fa11d68f..000000000
--- a/modules/luci-base/luasrc/view/cbi/ucisection.htm
+++ /dev/null
@@ -1,56 +0,0 @@
-<%-
-	if type(self.hidden) == "table" then
-		for k, v in pairs(self.hidden) do
--%>
-	<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
-<%-
-		end
-	end
-%>
-
-<% if self.tabs then %>
-	<%+cbi/tabcontainer%>
-<% else %>
-	<% self:render_children(section, scope or {}) %>
-<% end %>
-
-<% if self.error and self.error[section] then -%>
-	<div class="cbi-section-error" data-index="<%=#self.children + 1%>">
-		<ul><% for _, e in ipairs(self.error[section]) do -%>
-			<li>
-				<%- if e == "invalid" then -%>
-					<%:One or more fields contain invalid values!%>
-				<%- elseif e == "missing" then -%>
-					<%:One or more required fields have no value!%>
-				<%- else -%>
-					<%=pcdata(e)%>
-				<%- end -%>
-			</li>
-		<%- end %></ul>
-	</div>
-<%- end %>
-
-<% if self.optionals[section] and #self.optionals[section] > 0 or self.dynamic then %>
-	<div class="cbi-optionals" data-index="<%=#self.children + 1%>">
-		<%-
-		if self.dynamic then
-			local keys, vals, name, opt = { }, { }
-			for name, opt in pairs(self.optionals[section]) do
-				keys[#keys+1] = name
-				vals[#vals+1] = opt.title
-			end
-		-%>
-			<input type="text" id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>" data-type="uciname" data-optional="true"<%=
-				ifattr(#keys > 0, "data-choices", luci.util.json_encode({keys, vals}))
-			%> />
-		<%- else -%>
-			<select id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>" data-optionals="true">
-				<option><%: -- Additional Field -- %></option>
-				<% for key, val in pairs(self.optionals[section]) do -%>
-					<option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>" data-index="<%=val.index%>" data-depends="<%=pcdata(val:deplist2json(section))%>"><%=striptags(val.title)%></option>
-				<%- end %>
-			</select>
-		<%- end -%>
-		<input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:Add%>" />
-	</div>
-<% end %>
diff --git a/modules/luci-base/luasrc/view/cbi/upload.htm b/modules/luci-base/luasrc/view/cbi/upload.htm
deleted file mode 100644
index e61049538..000000000
--- a/modules/luci-base/luasrc/view/cbi/upload.htm
+++ /dev/null
@@ -1,14 +0,0 @@
-<%+cbi/valueheader%>
-
-<div<%=attr("data-ui-widget", luci.util.serialize_json({
-	"FileUpload", self:cfgvalue(section) or self.default, {
-		id = cbid,
-		name = cbid,
-		show_hidden = self.show_hidden,
-		enable_remove = self.enable_remove,
-		enable_upload = self.enable_upload,
-		root_directory = "/" --self.root_directory
-	}
-}))%>></div>
-
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/value.htm b/modules/luci-base/luasrc/view/cbi/value.htm
deleted file mode 100644
index 6060310b1..000000000
--- a/modules/luci-base/luasrc/view/cbi/value.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<%+cbi/valueheader%>
-
-<% local choices = self:choices()
-   if choices then %>
-	<div<%=attr("data-ui-widget", luci.util.serialize_json({
-		"Combobox", self:cfgvalue(section) or self.default, choices, {
-			id = cbid,
-			name = cbid,
-			size = self.size,
-			sort = self.keylist,
-			datatype = self.datatype,
-			optional = self.optional or self.rmempty,
-			readonly = self.readonly,
-			maxlength = self.maxlength,
-			placeholder = self.placeholder,
-			custom_placeholder = self.combobox_manual
-		}
-	}))%>></div>
-<% else %>
-	<div<%=attr("data-ui-widget", luci.util.serialize_json({
-		"Textfield", self:cfgvalue(section) or self.default, {
-			id = cbid,
-			name = cbid,
-			size = self.size,
-			datatype = self.datatype,
-			optional = self.optional or self.rmempty,
-			password = self.password,
-			readonly = self.readonly,
-			maxlength = self.maxlength,
-			placeholder = self.placeholder
-		}
-	}))%>></div>
-<% end %>
-
-<%+cbi/valuefooter%>
diff --git a/modules/luci-base/luasrc/view/cbi/valuefooter.htm b/modules/luci-base/luasrc/view/cbi/valuefooter.htm
deleted file mode 100644
index 805312e45..000000000
--- a/modules/luci-base/luasrc/view/cbi/valuefooter.htm
+++ /dev/null
@@ -1 +0,0 @@
-<% include( valuefooter or "cbi/full_valuefooter" ) %>
diff --git a/modules/luci-base/luasrc/view/cbi/valueheader.htm b/modules/luci-base/luasrc/view/cbi/valueheader.htm
deleted file mode 100644
index 761a54aed..000000000
--- a/modules/luci-base/luasrc/view/cbi/valueheader.htm
+++ /dev/null
@@ -1 +0,0 @@
-<% include( valueheader or "cbi/full_valueheader" ) %>
diff --git a/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm b/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
deleted file mode 100644
index eeb1d5c5c..000000000
--- a/modules/luci-base/luasrc/view/cbi/wireless_modefreq.htm
+++ /dev/null
@@ -1,173 +0,0 @@
-<%+cbi/valueheader%>
-
-<script type="text/javascript">//<![CDATA[
-	var freqlist = <%= luci.http.write_json(self.iwinfo.freqlist) %>;
-	var hwmodes  = <%= luci.http.write_json(self.iwinfo.hwmodelist or {}) %>;
-	var htmodes  = <%= luci.http.write_json(self.iwinfo.htmodelist) %>;
-	var acs =  <%= luci.http.write_json(self.hostapd_acs or 0) %>;
-
-	var channels = {
-		'11g': [
-			'auto', 'auto', true
-		],
-		'11a': [
-			'auto', 'auto', true
-		]
-	};
-
-	if (acs < 1) {
-		channels[(freqlist[freqlist.length - 1].mhz > 2484) ? '11a' : '11g'].length = 0;
-	}
-
-	for (var i = 0; i < freqlist.length; i++)
-		channels[(freqlist[i].mhz > 2484) ? '11a' : '11g'].push(
-			freqlist[i].channel,
-			'%d (%d MHz)'.format(freqlist[i].channel, freqlist[i].mhz),
-			!freqlist[i].restricted
-		);
-
-	var modes = [
-		'', 'Legacy', true,
-		'n', 'N', hwmodes.n,
-		'ac', 'AC', hwmodes.ac
-	];
-
-	var htmodes = {
-		'':   [
-			'', '-', true
-		],
-		'n':  [
-			'HT20', '20 MHz', htmodes.HT20,
-			'HT40', '40 MHz', htmodes.HT40
-		],
-		'ac': [
-			'VHT20', '20 MHz', htmodes.VHT20,
-			'VHT40', '40 MHz', htmodes.VHT40,
-			'VHT80', '80 MHz', htmodes.VHT80,
-			'VHT160', '160 MHz', htmodes.VHT160
-		]
-	};
-
-	var bands = {
-		'':   [
-			'11g', '2.4 GHz', (channels['11g'].length > 3),
-			'11a', '5 GHz', (channels['11a'].length > 3)
-		],
-		'n':  [
-			'11g', '2.4 GHz', (channels['11g'].length > 3),
-			'11a', '5 GHz', (channels['11a'].length > 3)
-		],
-		'ac': [
-			'11a', '5 GHz', true
-		]
-	};
-
-	function cbi_set_values(sel, vals)
-	{
-		if (sel.vals)
-			sel.vals.selected = sel.selectedIndex;
-
-		while (sel.options[0])
-			sel.remove(0);
-
-		for (var i = 0; vals && i < vals.length; i += 3)
-		{
-			if (!vals[i+2])
-				continue;
-
-			var opt = document.createElement('option');
-			    opt.value = vals[i+0];
-			    opt.text  = vals[i+1];
-
-			sel.add(opt);
-		}
-
-		if (!isNaN(vals.selected))
-			sel.selectedIndex = vals.selected;
-
-		sel.parentNode.style.display = (sel.options.length <= 1) ? 'none' : '';
-		sel.vals = vals;
-	}
-
-	function cbi_toggle_wifi_mode(id)
-	{
-		cbi_toggle_wifi_htmode(id);
-		cbi_toggle_wifi_band(id);
-	}
-
-	function cbi_toggle_wifi_htmode(id)
-	{
-		var mode = document.getElementById(id + '.mode');
-		var bwdt = document.getElementById(id + '.htmode');
-
-		cbi_set_values(bwdt, htmodes[mode.value]);
-	}
-
-	function cbi_toggle_wifi_band(id)
-	{
-		var mode = document.getElementById(id + '.mode');
-		var band = document.getElementById(id + '.band');
-
-		cbi_set_values(band, bands[mode.value]);
-		cbi_toggle_wifi_channel(id);
-	}
-
-	function cbi_toggle_wifi_channel(id)
-	{
-		var band = document.getElementById(id + '.band');
-		var chan = document.getElementById(id + '.channel');
-
-		cbi_set_values(chan, channels[band.value]);
-	}
-
-	function cbi_init_wifi(id)
-	{
-		var mode = document.getElementById(id + '.mode');
-		var band = document.getElementById(id + '.band');
-		var chan = document.getElementById(id + '.channel');
-		var bwdt = document.getElementById(id + '.htmode');
-
-		cbi_set_values(mode, modes);
-
-		if (/VHT20|VHT40|VHT80|VHT160/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
-			mode.value = 'ac';
-		else if (/HT20|HT40/.test(<%= luci.http.write_json(self.map:get(section, "htmode")) %>))
-			mode.value = 'n';
-		else
-			mode.value = '';
-
-		cbi_toggle_wifi_mode(id);
-
-		if (/a/.test(<%= luci.http.write_json(self.map:get(section, "hwmode")) %>))
-			band.value = '11a';
-		else
-			band.value = '11g';
-
-		cbi_toggle_wifi_band(id);
-
-		bwdt.value = <%= luci.http.write_json(self.map:get(section, "htmode")) %>;
-		chan.value = <%= luci.http.write_json(self.map:get(section, "channel")) %>;
-	}
-//]]></script>
-
-<label style="float:left; margin-right:3px">
-	<%:Mode%><br />
-	<select style="width:auto" id="<%= cbid %>.mode" name="<%= cbid %>.mode" onchange="cbi_toggle_wifi_mode('<%= cbid %>')"></select>
-</label>
-<label style="float:left; margin-right:3px">
-	<%:Band%><br />
-	<select style="width:auto" id="<%= cbid %>.band" name="<%= cbid %>.band" onchange="cbi_toggle_wifi_band('<%= cbid %>')"></select>
-</label>
-<label style="float:left; margin-right:3px">
-	<%:Channel%><br />
-	<select style="width:auto" id="<%= cbid %>.channel" name="<%= cbid %>.channel"></select>
-</label>
-<label style="float:left; margin-right:3px">
-	<%:Width%><br />
-	<select style="width:auto" id="<%= cbid %>.htmode" name="<%= cbid %>.htmode"></select>
-</label>
-<br style="clear:left" />
-
-<script type="text/javascript">cbi_init_wifi('<%= cbid %>');</script>
-
-<%+cbi/valuefooter%>