Rework LuCI build system

 * Rename subdirectories to their repective OpenWrt package names
 * Make each LuCI module its own standalone package
 * Deploy a shared luci.mk which is used by each module Makefile

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

7 files changed, 874 insertions, 0 deletions

diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
new file mode 100644
index 0000000000..5547db6cdd
--- /dev/null
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/dhcp.lua
@@ -0,0 +1,109 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local uci = require "luci.model.uci".cursor()
+local sys = require "luci.sys"
+local wa  = require "luci.tools.webadmin"
+local fs  = require "nixio.fs"
+
+m = Map("dhcp", "DHCP")
+
+s = m:section(TypedSection, "dhcp", "DHCP-Server")
+s.anonymous = true
+s.addremove = false
+s.dynamic = false
+
+s:depends("interface", "lan")
+
+enable = s:option(ListValue, "ignore", translate("enable"), "")
+enable:value(0, translate("enable"))
+enable:value(1, translate("disable"))
+
+start = s:option(Value, "start", translate("First leased address"))
+start.rmempty = true
+start:depends("ignore", "0")
+
+
+limit = s:option(Value, "limit", translate("Number of leased addresses"), "")
+limit:depends("ignore", "0")
+
+function limit.cfgvalue(self, section)
+	local value = Value.cfgvalue(self, section)
+	
+	if value then
+		return tonumber(value) + 1
+	end 
+end
+
+function limit.write(self, section, value)
+	value = tonumber(value) - 1
+	return Value.write(self, section, value) 
+end
+
+limit.rmempty = true
+
+time = s:option(Value, "leasetime")
+time:depends("ignore", "0")
+time.rmempty = true
+
+
+local leasefn, leasefp, leases
+uci:foreach("dhcp", "dnsmasq",
+ function(section)
+ 	leasefn = section.leasefile
+ end
+) 
+local leasefp = leasefn and fs.access(leasefn) and io.lines(leasefn)
+if leasefp then
+	leases = {}
+	for lease in leasefp do
+		table.insert(leases, luci.util.split(lease, " "))
+	end
+end
+
+if leases then
+	v = m:section(Table, leases, translate("Active Leases"))
+	name = v:option(DummyValue, 4, translate("Hostname"))
+	function name.cfgvalue(self, ...)
+		local value = DummyValue.cfgvalue(self, ...)
+		return (value == "*") and "?" or value
+	end
+	ip = v:option(DummyValue, 3, translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+	mac  = v:option(DummyValue, 2, translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+	ltime = v:option(DummyValue, 1, translate("Leasetime remaining"))
+	function ltime.cfgvalue(self, ...)
+		local value = DummyValue.cfgvalue(self, ...)
+		return wa.date_format(os.difftime(tonumber(value), os.time()))
+	end
+end
+
+s2 = m:section(TypedSection, "host", translate("Static Leases"))
+s2.addremove = true
+s2.anonymous = true
+s2.template = "cbi/tblsection"
+
+name = s2:option(Value, "name", translate("Hostname"))
+mac = s2:option(Value, "mac", translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"))
+ip = s2:option(Value, "ip", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+sys.net.arptable(function(entry)
+	ip:value(entry["IP address"])
+	mac:value(
+		entry["HW address"],
+		entry["HW address"] .. " (" .. entry["IP address"] .. ")"
+	)
+end)
+
+return m
+
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua
new file mode 100644
index 0000000000..71b5dafa3c
--- /dev/null
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/index.lua
@@ -0,0 +1,14 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+return Template("mini/index")
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua
new file mode 100644
index 0000000000..78255c1d97
--- /dev/null
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/luci.lua
@@ -0,0 +1,48 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require "luci.config"
+local fs = require "nixio.fs"
+
+m = Map("luci", translate("Web <abbr title=\"User Interface\">UI</abbr>"), translate("Here you can customize the settings and the functionality of <abbr title=\"Lua Configuration Interface\">LuCI</abbr>."))
+
+-- force reload of global luci config namespace to reflect the changes
+function m.commit_handler(self)
+	package.loaded["luci.config"] = nil
+	require "luci.config"
+end
+
+
+c = m:section(NamedSection, "main", "core", translate("General"))
+
+l = c:option(ListValue, "lang", translate("Language"))
+l:value("auto")
+
+local i18ndir = luci.i18n.i18ndir .. "base."
+for k, v in luci.util.kspairs(luci.config.languages) do
+	local file = i18ndir .. k:gsub("_", "-")
+	if k:sub(1, 1) ~= "." and fs.access(file .. ".lmo") then
+		l:value(k, v)
+	end
+end
+
+t = c:option(ListValue, "mediaurlbase", translate("Design"))
+for k, v in pairs(luci.config.themes) do
+	if k:sub(1, 1) ~= "." then
+		t:value(v, k)
+	end
+end
+
+return m
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua
new file mode 100644
index 0000000000..57edc47187
--- /dev/null
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/network.lua
@@ -0,0 +1,205 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+local wa  = require "luci.tools.webadmin"
+local sys = require "luci.sys"
+local fs  = require "nixio.fs"
+
+local has_pptp  = fs.access("/usr/sbin/pptp")
+local has_pppoe = fs.glob("/usr/lib/pppd/*/rp-pppoe.so")()
+
+local network = luci.model.uci.cursor_state():get_all("network")
+
+local netstat = sys.net.deviceinfo()
+local ifaces = {}
+
+for k, v in pairs(network) do
+	if v[".type"] == "interface" and k ~= "loopback" then
+		table.insert(ifaces, v)
+	end
+end
+
+m = Map("network", translate("Network"))
+s = m:section(Table, ifaces, translate("Status"))
+s.parse = function() end
+
+s:option(DummyValue, ".name", translate("Network"))
+
+hwaddr = s:option(DummyValue, "_hwaddr",
+ translate("<abbr title=\"Media Access Control\">MAC</abbr>-Address"), translate("Hardware Address"))
+function hwaddr.cfgvalue(self, section)
+	local ix = self.map:get(section, "ifname") or ""
+	local mac = fs.readfile("/sys/class/net/" .. ix .. "/address")
+
+	if not mac then
+		mac = luci.util.exec("ifconfig " .. ix)
+		mac = mac and mac:match(" ([A-F0-9:]+)%s*\n")
+	end
+
+	if mac and #mac > 0 then
+		return mac:upper()
+	end
+
+	return "?"
+end
+
+
+s:option(DummyValue, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+
+s:option(DummyValue, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+
+
+txrx = s:option(DummyValue, "_txrx",
+ translate("Traffic"), translate("transmitted / received"))
+
+function txrx.cfgvalue(self, section)
+	local ix = self.map:get(section, "ifname")
+
+	local rx = netstat and netstat[ix] and netstat[ix][1]
+	rx = rx and wa.byte_format(tonumber(rx)) or "-"
+
+	local tx = netstat and netstat[ix] and netstat[ix][9]
+	tx = tx and wa.byte_format(tonumber(tx)) or "-"
+
+	return string.format("%s / %s", tx, rx)
+end
+
+errors = s:option(DummyValue, "_err",
+ translate("Errors"), translate("TX / RX"))
+
+function errors.cfgvalue(self, section)
+	local ix = self.map:get(section, "ifname")
+
+	local rx = netstat and netstat[ix] and netstat[ix][3]
+	local tx = netstat and netstat[ix] and netstat[ix][11]
+
+	rx = rx and tostring(rx) or "-"
+	tx = tx and tostring(tx) or "-"
+
+	return string.format("%s / %s", tx, rx)
+end
+
+
+
+s = m:section(NamedSection, "lan", "interface", translate("Local Network"))
+s.addremove = false
+s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+
+nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+nm:value("255.255.255.0")
+nm:value("255.255.0.0")
+nm:value("255.0.0.0")
+
+gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway") .. translate(" (optional)"))
+gw.rmempty = true
+dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server") .. translate(" (optional)"))
+dns.rmempty = true
+
+
+s = m:section(NamedSection, "wan", "interface", translate("Internet Connection"))
+s.addremove = false
+p = s:option(ListValue, "proto", translate("Protocol"))
+p.override_values = true
+p:value("none", "disabled")
+p:value("static", translate("manual"))
+p:value("dhcp", translate("automatic"))
+if has_pppoe then p:value("pppoe", "PPPoE") end
+if has_pptp  then p:value("pptp",  "PPTP")  end
+
+function p.write(self, section, value)
+	-- Always set defaultroute to PPP and use remote dns
+	-- Overwrite a bad variable behaviour in OpenWrt
+	if value == "pptp" or value == "pppoe" then
+		self.map:set(section, "peerdns", "1")
+		self.map:set(section, "defaultroute", "1")
+	end
+	return ListValue.write(self, section, value)
+end
+
+if not ( has_pppoe and has_pptp ) then
+	p.description = translate("You need to install \"ppp-mod-pppoe\" for PPPoE or \"pptp\" for PPtP support")
+end
+
+
+ip = s:option(Value, "ipaddr", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Address"))
+ip:depends("proto", "static")
+
+nm = s:option(Value, "netmask", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Netmask"))
+nm:depends("proto", "static")
+
+gw = s:option(Value, "gateway", translate("<abbr title=\"Internet Protocol Version 4\">IPv4</abbr>-Gateway"))
+gw:depends("proto", "static")
+gw.rmempty = true
+
+dns = s:option(Value, "dns", translate("<abbr title=\"Domain Name System\">DNS</abbr>-Server"))
+dns:depends("proto", "static")
+dns.rmempty = true
+
+usr = s:option(Value, "username", translate("Username"))
+usr:depends("proto", "pppoe")
+usr:depends("proto", "pptp")
+
+pwd = s:option(Value, "password", translate("Password"))
+pwd.password = true
+pwd:depends("proto", "pppoe")
+pwd:depends("proto", "pptp")
+
+
+-- Allow user to set MSS correction here if the UCI firewall is installed
+-- This cures some cancer for providers with pre-war routers
+if fs.access("/etc/config/firewall") then
+	mssfix = s:option(Flag, "_mssfix",
+		translate("Clamp Segment Size"), translate("Fixes problems with unreachable websites, submitting forms or other unexpected behaviour for some ISPs."))
+	mssfix.rmempty = false
+
+	function mssfix.cfgvalue(self)
+		local value
+		m.uci:foreach("firewall", "forwarding", function(s)
+			if s.src == "lan" and s.dest == "wan" then
+				value = s.mtu_fix
+			end
+		end)
+		return value
+	end
+
+	function mssfix.write(self, section, value)
+		m.uci:foreach("firewall", "forwarding", function(s)
+			if s.src == "lan" and s.dest == "wan" then
+				m.uci:set("firewall", s[".name"], "mtu_fix", value)
+				m:chain("firewall")
+			end
+		end)
+	end
+end
+
+kea = s:option(Flag, "keepalive", translate("automatically reconnect"))
+kea:depends("proto", "pppoe")
+kea:depends("proto", "pptp")
+kea.rmempty = true
+kea.enabled = "10"
+
+
+cod = s:option(Value, "demand", translate("disconnect when idle for"), "s")
+cod:depends("proto", "pppoe")
+cod:depends("proto", "pptp")
+cod.rmempty = true
+
+srv = s:option(Value, "server", translate("<abbr title=\"Point-to-Point Tunneling Protocol\">PPTP</abbr>-Server"))
+srv:depends("proto", "pptp")
+srv.rmempty = true
+
+
+
+return m
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
new file mode 100644
index 0000000000..6f13bb0fc8
--- /dev/null
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/passwd.lua
@@ -0,0 +1,45 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+f = SimpleForm("password", translate("Admin Password"), translate("Change the password of the system administrator (User <code>root</code>)"))
+
+pw1 = f:field(Value, "pw1", translate("Password"))
+pw1.password = true
+pw1.rmempty = false
+
+pw2 = f:field(Value, "pw2", translate("Confirmation"))
+pw2.password = true
+pw2.rmempty = false
+
+function pw2.validate(self, value, section)
+	return pw1:formvalue(section) == value and value
+end
+
+function f.handle(self, state, data)
+	if state == FORM_VALID then
+		local stat = luci.sys.user.setpasswd("root", data.pw1) == 0
+		
+		if stat then
+			f.message = translate("Password successfully changed")
+		else
+			f.errmessage = translate("Unknown Error")
+		end
+		
+		data.pw1 = nil
+		data.pw2 = nil
+	end
+	return true
+end
+
+return f
\ No newline at end of file
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua
new file mode 100644
index 0000000000..593af04f25
--- /dev/null
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/system.lua
@@ -0,0 +1,80 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+require("luci.sys")
+require("luci.sys.zoneinfo")
+require("luci.tools.webadmin")
+
+
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
+
+s = m:section(TypedSection, "system", "")
+s.anonymous = true
+s.addremove = false
+
+
+local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
+local uptime = luci.sys.uptime()
+
+s:option(DummyValue, "_system", translate("System")).value = model
+s:option(DummyValue, "_cpu", translate("Processor")).value = system
+
+local load1, load5, load15 = luci.sys.loadavg()
+s:option(DummyValue, "_la", translate("Load")).value =
+ string.format("%.2f, %.2f, %.2f", load1, load5, load15)
+
+s:option(DummyValue, "_memtotal", translate("Memory")).value =
+ string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
+  tonumber(memtotal) / 1024,
+  100 * memcached / memtotal,
+  tostring(translate("cached")),
+  100 * membuffers / memtotal,
+  tostring(translate("buffered")),
+  100 * memfree / memtotal,
+  tostring(translate("free"))
+)
+
+s:option(DummyValue, "_systime", translate("Local Time")).value =
+ os.date("%c")
+
+s:option(DummyValue, "_uptime", translate("Uptime")).value =
+ luci.tools.webadmin.date_format(tonumber(uptime))
+
+hn = s:option(Value, "hostname", translate("Hostname"))
+
+function hn.write(self, section, value)
+	Value.write(self, section, value)
+	luci.sys.hostname(value)
+end
+
+
+tz = s:option(ListValue, "zonename", translate("Timezone"))
+tz:value("UTC")
+
+for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
+        tz:value(zone[1])
+end
+
+function tz.write(self, section, value)
+        local function lookup_zone(title)
+                for _, zone in ipairs(luci.sys.zoneinfo.TZ) do
+                        if zone[1] == title then return zone[2] end
+                end
+        end
+
+        AbstractValue.write(self, section, value)
+        self.map.uci:set("system", section, "timezone", lookup_zone(value) or "GMT0")
+end
+
+return m
diff --git a/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
new file mode 100644
index 0000000000..a18c072e73
--- /dev/null
+++ b/modules/luci-mod-admin-mini/luasrc/model/cbi/mini/wifi.lua
@@ -0,0 +1,373 @@
+--[[
+LuCI - Lua Configuration Interface
+
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+]]--
+
+-- Data init --
+
+local fs  = require "nixio.fs"
+local sys = require "luci.sys"
+local uci = require "luci.model.uci".cursor()
+
+if not uci:get("network", "wan") then
+	uci:section("network", "interface", "wan", {proto="none", ifname=" "})
+	uci:save("network")
+	uci:commit("network")
+end
+
+local wlcursor = luci.model.uci.cursor_state()
+local wireless = wlcursor:get_all("wireless")
+local wifidevs = {}
+local ifaces = {}
+
+for k, v in pairs(wireless) do
+	if v[".type"] == "wifi-iface" then
+		table.insert(ifaces, v)
+	end
+end
+
+wlcursor:foreach("wireless", "wifi-device",
+	function(section)
+		table.insert(wifidevs, section[".name"])
+	end)
+
+
+-- Main Map --
+
+m = Map("wireless", translate("Wifi"), translate("Here you can configure installed wifi devices."))
+m:chain("network")
+
+
+-- Status Table --
+s = m:section(Table, ifaces, translate("Networks"))
+
+link = s:option(DummyValue, "_link", translate("Link"))
+function link.cfgvalue(self, section)
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	return iwinfo and "%d/%d" %{ iwinfo.quality, iwinfo.quality_max } or "-"
+end
+
+essid = s:option(DummyValue, "ssid", "ESSID")
+
+bssid = s:option(DummyValue, "_bsiid", "BSSID")
+function bssid.cfgvalue(self, section)
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	return iwinfo and iwinfo.bssid or "-"
+end
+
+channel = s:option(DummyValue, "channel", translate("Channel"))
+function channel.cfgvalue(self, section)
+	return wireless[self.map:get(section, "device")].channel
+end
+
+protocol = s:option(DummyValue, "_mode", translate("Protocol"))
+function protocol.cfgvalue(self, section)
+	local mode = wireless[self.map:get(section, "device")].mode
+	return mode and "802." .. mode
+end
+
+mode = s:option(DummyValue, "mode", translate("Mode"))
+encryption = s:option(DummyValue, "encryption", translate("<abbr title=\"Encrypted\">Encr.</abbr>"))
+
+power = s:option(DummyValue, "_power", translate("Power"))
+function power.cfgvalue(self, section)
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	return iwinfo and "%d dBm" % iwinfo.txpower or "-"
+end
+
+scan = s:option(Button, "_scan", translate("Scan"))
+scan.inputstyle = "find"
+
+function scan.cfgvalue(self, section)
+	return self.map:get(section, "ifname") or false
+end
+
+-- WLAN-Scan-Table --
+
+t2 = m:section(Table, {}, translate("<abbr title=\"Wireless Local Area Network\">WLAN</abbr>-Scan"), translate("Wifi networks in your local environment"))
+
+function scan.write(self, section)
+	m.autoapply = false
+	t2.render = t2._render
+	local ifname = self.map:get(section, "ifname")
+	local iwinfo = sys.wifi.getiwinfo(ifname)
+	if iwinfo then
+		local _, cell
+		for _, cell in ipairs(iwinfo.scanlist) do
+			t2.data[#t2.data+1] = {
+				Quality = "%d/%d" %{ cell.quality, cell.quality_max },
+				ESSID   = cell.ssid,
+				Address = cell.bssid,
+				Mode    = cell.mode,
+				["Encryption key"] = cell.encryption.enabled and "On" or "Off",
+				["Signal level"]   = "%d dBm" % cell.signal,
+				["Noise level"]    = "%d dBm" % iwinfo.noise
+			}
+		end
+	end
+end
+
+t2._render = t2.render
+t2.render = function() end
+
+t2:option(DummyValue, "Quality", translate("Link"))
+essid = t2:option(DummyValue, "ESSID", "ESSID")
+function essid.cfgvalue(self, section)
+	return self.map:get(section, "ESSID")
+end
+
+t2:option(DummyValue, "Address", "BSSID")
+t2:option(DummyValue, "Mode", translate("Mode"))
+chan = t2:option(DummyValue, "channel", translate("Channel"))
+function chan.cfgvalue(self, section)
+	return self.map:get(section, "Channel")
+	    or self.map:get(section, "Frequency")
+	    or "-"
+end
+
+t2:option(DummyValue, "Encryption key", translate("<abbr title=\"Encrypted\">Encr.</abbr>"))
+
+t2:option(DummyValue, "Signal level", translate("Signal"))
+
+t2:option(DummyValue, "Noise level", translate("Noise"))
+
+
+
+if #wifidevs < 1 then
+	return m
+end
+
+-- Config Section --
+
+s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("Devices"))
+s.addremove = false
+
+en = s:option(Flag, "disabled", translate("enable"))
+en.rmempty = false
+en.enabled = "0"
+en.disabled = "1"
+
+function en.cfgvalue(self, section)
+	return Flag.cfgvalue(self, section) or "0"
+end
+
+
+local hwtype = m:get(wifidevs[1], "type")
+
+if hwtype == "atheros" then
+	mode = s:option(ListValue, "hwmode", translate("Mode"))
+	mode.override_values = true
+	mode:value("", "auto")
+	mode:value("11b", "802.11b")
+	mode:value("11g", "802.11g")
+	mode:value("11a", "802.11a")
+	mode:value("11bg", "802.11b+g")
+	mode.rmempty = true
+end
+
+
+ch = s:option(Value, "channel", translate("Channel"))
+for i=1, 14 do
+	ch:value(i, i .. " (2.4 GHz)")
+end
+
+
+s = m:section(TypedSection, "wifi-iface", translate("Local Network"))
+s.anonymous = true
+s.addremove = false
+
+s:option(Value, "ssid", translate("Network Name (<abbr title=\"Extended Service Set Identifier\">ESSID</abbr>)"))
+
+bssid = s:option(Value, "bssid", translate("<abbr title=\"Basic Service Set Identifier\">BSSID</abbr>"))
+
+local devs = {}
+luci.model.uci.cursor():foreach("wireless", "wifi-device",
+	function (section)
+		table.insert(devs, section[".name"])
+	end)
+
+if #devs > 1 then
+	device = s:option(DummyValue, "device", translate("Device"))
+else
+	s.defaults.device = devs[1]
+end
+
+mode = s:option(ListValue, "mode", translate("Mode"))
+mode.override_values = true
+mode:value("ap", translate("Provide (Access Point)"))
+mode:value("adhoc", translate("Independent (Ad-Hoc)"))
+mode:value("sta", translate("Join (Client)"))
+
+function mode.write(self, section, value)
+	if value == "sta" then
+		local oldif = m.uci:get("network", "wan", "ifname")
+		if oldif and oldif ~= " " then
+			m.uci:set("network", "wan", "_ifname", oldif)
+		end
+		m.uci:set("network", "wan", "ifname", " ")
+
+		self.map:set(section, "network", "wan")
+	else
+		if m.uci:get("network", "wan", "_ifname") then
+			m.uci:set("network", "wan", "ifname", m.uci:get("network", "wan", "_ifname"))
+		end
+		self.map:set(section, "network", "lan")
+	end
+
+	return ListValue.write(self, section, value)
+end
+
+encr = s:option(ListValue, "encryption", translate("Encryption"))
+encr.override_values = true
+encr:value("none", "No Encryption")
+encr:value("wep", "WEP")
+
+if hwtype == "atheros" or hwtype == "mac80211" then
+	local supplicant = fs.access("/usr/sbin/wpa_supplicant")
+	local hostapd    = fs.access("/usr/sbin/hostapd")
+
+	if hostapd and supplicant then
+		encr:value("psk", "WPA-PSK")
+		encr:value("psk2", "WPA2-PSK")
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode")
+		encr:value("wpa", "WPA-Radius", {mode="ap"}, {mode="sta"})
+		encr:value("wpa2", "WPA2-Radius", {mode="ap"}, {mode="sta"})
+	elseif hostapd and not supplicant then
+		encr:value("psk", "WPA-PSK", {mode="ap"}, {mode="adhoc"})
+		encr:value("psk2", "WPA2-PSK", {mode="ap"}, {mode="adhoc"})
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="ap"}, {mode="adhoc"})
+		encr:value("wpa", "WPA-Radius", {mode="ap"})
+		encr:value("wpa2", "WPA2-Radius", {mode="ap"})
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)
+	elseif not hostapd and supplicant then
+		encr:value("psk", "WPA-PSK", {mode="sta"})
+		encr:value("psk2", "WPA2-PSK", {mode="sta"})
+		encr:value("psk-mixed", "WPA-PSK/WPA2-PSK Mixed Mode", {mode="sta"})
+		encr:value("wpa", "WPA-EAP", {mode="sta"})
+		encr:value("wpa2", "WPA2-EAP", {mode="sta"})
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)		
+	else
+		encr.description = translate(
+			"WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " ..
+			"and ad-hoc mode) to be installed."
+		)
+	end
+elseif hwtype == "broadcom" then
+	encr:value("psk", "WPA-PSK")
+	encr:value("psk2", "WPA2-PSK")
+	encr:value("psk+psk2", "WPA-PSK/WPA2-PSK Mixed Mode")
+end
+
+key = s:option(Value, "key", translate("Key"))
+key:depends("encryption", "wep")
+key:depends("encryption", "psk")
+key:depends("encryption", "psk2")
+key:depends("encryption", "psk+psk2")
+key:depends("encryption", "psk-mixed")
+key:depends({mode="ap", encryption="wpa"})
+key:depends({mode="ap", encryption="wpa2"})
+key.rmempty = true
+key.password = true
+
+server = s:option(Value, "server", translate("Radius-Server"))
+server:depends({mode="ap", encryption="wpa"})
+server:depends({mode="ap", encryption="wpa2"})
+server.rmempty = true
+
+port = s:option(Value, "port", translate("Radius-Port"))
+port:depends({mode="ap", encryption="wpa"})
+port:depends({mode="ap", encryption="wpa2"})
+port.rmempty = true
+
+
+if hwtype == "atheros" or hwtype == "mac80211" then
+	nasid = s:option(Value, "nasid", translate("NAS ID"))
+	nasid:depends({mode="ap", encryption="wpa"})
+	nasid:depends({mode="ap", encryption="wpa2"})
+	nasid.rmempty = true
+
+	eaptype = s:option(ListValue, "eap_type", translate("EAP-Method"))
+	eaptype:value("TLS")
+	eaptype:value("TTLS")
+	eaptype:value("PEAP")
+	eaptype:depends({mode="sta", encryption="wpa"})
+	eaptype:depends({mode="sta", encryption="wpa2"})
+
+	cacert = s:option(FileUpload, "ca_cert", translate("Path to CA-Certificate"))
+	cacert:depends({mode="sta", encryption="wpa"})
+	cacert:depends({mode="sta", encryption="wpa2"})
+
+	privkey = s:option(FileUpload, "priv_key", translate("Path to Private Key"))
+	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa2"})
+	privkey:depends({mode="sta", eap_type="TLS", encryption="wpa"})
+
+	privkeypwd = s:option(Value, "priv_key_pwd", translate("Password of Private Key"))
+	privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa2"})
+	privkeypwd:depends({mode="sta", eap_type="TLS", encryption="wpa"})
+
+
+	auth = s:option(Value, "auth", translate("Authentication"))
+	auth:value("PAP")
+	auth:value("CHAP")
+	auth:value("MSCHAP")
+	auth:value("MSCHAPV2")
+	auth:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
+	auth:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+	auth:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	auth:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+
+
+	identity = s:option(Value, "identity", translate("Identity"))
+	identity:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
+	identity:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+	identity:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	identity:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+
+	password = s:option(Value, "password", translate("Password"))
+	password:depends({mode="sta", eap_type="PEAP", encryption="wpa2"})
+	password:depends({mode="sta", eap_type="PEAP", encryption="wpa"})
+	password:depends({mode="sta", eap_type="TTLS", encryption="wpa2"})
+	password:depends({mode="sta", eap_type="TTLS", encryption="wpa"})
+end
+
+
+if hwtype == "atheros" or hwtype == "broadcom" then
+	iso = s:option(Flag, "isolate", translate("AP-Isolation"), translate("Prevents Client to Client communication"))
+	iso.rmempty = true
+	iso:depends("mode", "ap")
+
+	hide = s:option(Flag, "hidden", translate("Hide <abbr title=\"Extended Service Set Identifier\">ESSID</abbr>"))
+	hide.rmempty = true
+	hide:depends("mode", "ap")
+end
+
+if hwtype == "mac80211" or hwtype == "atheros" then
+	bssid:depends({mode="adhoc"})
+end
+
+if hwtype == "broadcom" then
+	bssid:depends({mode="wds"})
+	bssid:depends({mode="adhoc"})
+end
+
+
+return m