Merge branch 'menu'

32 files changed, 333 insertions, 155 deletions

diff --git a/modules/admin-core/src/controller/admin/index.lua b/modules/admin-core/src/controller/admin/index.lua
index b4a7720f8b..89545f1d57 100644
--- a/modules/admin-core/src/controller/admin/index.lua
+++ b/modules/admin-core/src/controller/admin/index.lua
@@ -1 +1,24 @@
-module("ffluci.controller.admin.index", package.seeall)
\ No newline at end of file
+module("ffluci.controller.admin.index", package.seeall)
+
+function index()
+	local root = node()
+	if not root.target then
+		root.target = alias("admin")
+	end
+	
+	local page  = node("admin")
+	page.target = alias("admin", "index")
+	page.title  = "Administration"
+	page.order  = 10
+	
+	local page  = node("admin", "index")
+	page.target = template("admin_index/index")
+	page.title  = "Übersicht"
+	page.order  = 10
+	
+	local page  = node("admin", "index", "luci")
+	page.target = cbi("admin_index/luci")
+	page.title  = "Oberfläche"
+	
+	
+end
\ No newline at end of file
diff --git a/modules/admin-core/src/controller/admin/network.lua b/modules/admin-core/src/controller/admin/network.lua
index 0e3165f085..8f11c28489 100644
--- a/modules/admin-core/src/controller/admin/network.lua
+++ b/modules/admin-core/src/controller/admin/network.lua
@@ -1 +1,39 @@
-module("ffluci.controller.admin.network", package.seeall)
\ No newline at end of file
+module("ffluci.controller.admin.network", package.seeall)
+
+function index()
+	local page  = node("admin", "network")
+	page.target = template("admin_network/index")
+	page.title  = "Netzwerk"  
+	page.order  = 50
+	
+	local page  = node("admin", "network", "vlan")
+	page.target = cbi("admin_network/vlan")
+	page.title  = "Switch"
+	page.order  = 10
+	
+	local page  = node("admin", "network", "ifaces")
+	page.target = cbi("admin_network/ifaces")
+	page.title  = "Schnittstellen"
+	page.order  = 20
+	
+	local page  = node("admin", "network", "dhcp")
+	page.target = cbi("admin_network/dhcp")
+	page.title  = "DHCP-Server"
+	page.order  = 30
+	
+	local page  = node("admin", "network", "ptp")
+	page.target = cbi("admin_network/ptp")
+	page.title  = "PPPoE / PPTP"
+	page.order  = 40
+	
+	local page  = node("admin", "network", "routes")
+	page.target = cbi("admin_network/routes")
+	page.title  = "Statische Routen"
+	page.order  = 50
+	
+	if ffluci.fs.isfile("/etc/config/qos") then
+		local page  = node("admin", "network", "qos")
+		page.target = cbi("admin_network/qos")
+		page.title  = "Quality of Service"
+	end
+end
\ No newline at end of file
diff --git a/modules/admin-core/src/controller/admin/services.lua b/modules/admin-core/src/controller/admin/services.lua
index 42181212bd..cb7c170a06 100644
--- a/modules/admin-core/src/controller/admin/services.lua
+++ b/modules/admin-core/src/controller/admin/services.lua
@@ -1 +1,29 @@
-module("ffluci.controller.admin.services", package.seeall)
\ No newline at end of file
+module("ffluci.controller.admin.services", package.seeall)
+
+function index()
+	local page  = node("admin", "services")
+	page.target = template("admin_services/index")
+	page.title  = "Dienste"  
+	page.order  = 40
+	
+	local page  = node("admin", "services", "httpd")
+	page.target = cbi("admin_services/httpd")
+	page.title  = "HTTP-Server"
+	page.order  = 10
+	
+	local page  = node("admin", "services", "dropbear")
+	page.target = cbi("admin_services/dropbear")
+	page.title  = "SSH-Server"
+	page.order  = 20
+	
+	local page  = node("admin", "services", "dnsmasq")
+	page.target = cbi("admin_services/dnsmasq")
+	page.title  = "Dnsmasq"
+	page.order  = 30
+	
+	if ffluci.fs.isfile("/etc/config/olsr") then
+		local page  = node("admin", "services", "olsr")
+		page.target = cbi("admin_services/olsrd")
+		page.title  = "OLSR"
+	end
+end
\ No newline at end of file
diff --git a/modules/admin-core/src/controller/admin/status.lua b/modules/admin-core/src/controller/admin/status.lua
index fa9fe65bde..1c26257e98 100644
--- a/modules/admin-core/src/controller/admin/status.lua
+++ b/modules/admin-core/src/controller/admin/status.lua
@@ -1,5 +1,16 @@
 module("ffluci.controller.admin.status", package.seeall)
 
+function index()
+	local page  = node("admin", "status")
+	page.target = template("admin_status/index")
+	page.title  = "Status"
+	page.order  = 20
+	
+	local page  = node("admin", "status", "syslog")
+	page.target = action_syslog
+	page.title  = "Systemprotokoll"
+end
+
 function action_syslog()
 	local syslog = ffluci.sys.syslog()
 	ffluci.template.render("admin_status/syslog", {syslog=syslog})
diff --git a/modules/admin-core/src/controller/admin/system.lua b/modules/admin-core/src/controller/admin/system.lua
index a612660092..fb108c90ae 100644
--- a/modules/admin-core/src/controller/admin/system.lua
+++ b/modules/admin-core/src/controller/admin/system.lua
@@ -7,6 +7,52 @@ require("ffluci.fs")
 require("ffluci.model.ipkg")
 require("ffluci.model.uci")
 
+function index()
+	local page  = node("admin", "system")
+	page.target = template("admin_system/index")
+	page.title  = "System"  
+	page.order  = 30
+	
+	local page  = node("admin", "system", "packages")
+	page.target = action_packages
+	page.title  = "Paketverwaltung"
+	page.order  = 10
+	
+	local page  = node("admin", "system", "packages", "ipkg")
+	page.target = action_ipkg
+	page.title  = "IPKG-Konfiguration"
+	
+	local page  = node("admin", "system", "passwd")
+	page.target = action_passwd
+	page.title  = "Passwort ändern"
+	page.order  = 20
+	
+	local page  = node("admin", "system", "sshkeys")
+	page.target = action_sshkeys
+	page.title  = "SSH-Schlüssel"
+	page.order  = 30
+	
+	local page  = node("admin", "system", "hostname")
+	page.target = cbi("admin_system/hostname")
+	page.title  = "Hostname"
+	page.order  = 40
+	
+	local page  = node("admin", "system", "fstab")
+	page.target = cbi("admin_system/fstab")
+	page.title  = "Einhängepunkte"
+	page.order  = 50
+	
+	local page  = node("admin", "system", "upgrade")
+	page.target = action_upgrade
+	page.title  = "Firmwareupgrade"
+	page.order  = 60
+	
+	local page  = node("admin", "system", "reboot")
+	page.target = action_reboot
+	page.title  = "Neu starten"
+	page.order  = 70
+end
+
 function action_editor()
 	local file = ffluci.http.formvalue("file", "")
 	local data = ffluci.http.formvalue("data")
diff --git a/modules/admin-core/src/controller/admin/uci.lua b/modules/admin-core/src/controller/admin/uci.lua
index cb4a95ba5c..7443a16b0b 100644
--- a/modules/admin-core/src/controller/admin/uci.lua
+++ b/modules/admin-core/src/controller/admin/uci.lua
@@ -2,6 +2,12 @@ module("ffluci.controller.admin.uci", package.seeall)
 require("ffluci.util")
 require("ffluci.sys")
 
+function index()
+	node("admin", "uci", "changes").target = template("admin_uci/changes")
+	node("admin", "uci", "revert").target  = action_revert
+	node("admin", "uci", "apply").target   = action_apply
+end
+
 -- This function has a higher priority than the admin_uci/apply template
 function action_apply()
 	local changes = ffluci.model.uci.changes()
diff --git a/modules/admin-core/src/controller/admin/wifi.lua b/modules/admin-core/src/controller/admin/wifi.lua
index bc1040c715..922366c543 100644
--- a/modules/admin-core/src/controller/admin/wifi.lua
+++ b/modules/admin-core/src/controller/admin/wifi.lua
@@ -1 +1,18 @@
-module("ffluci.controller.admin.wifi", package.seeall)
\ No newline at end of file
+module("ffluci.controller.admin.wifi", package.seeall)
+
+function index()
+	local page  = node("admin", "wifi")
+	page.target = template("admin_wifi/index")
+	page.title  = "Drahtlos"  
+	page.order  = 60
+	
+	local page  = node("admin", "wifi", "devices")
+	page.target = cbi("admin_wifi/devices")
+	page.title  = "Geräte"
+	page.order  = 10
+	
+	local page  = node("admin", "wifi", "networks")
+	page.target = cbi("admin_wifi/networks")
+	page.title  = "Netze"
+	page.order  = 20
+end
\ No newline at end of file
diff --git a/modules/admin-core/src/i18n/admin_index.en b/modules/admin-core/src/i18n/admin_index.en
index 6a48775233..e146644113 100644
--- a/modules/admin-core/src/i18n/admin_index.en
+++ b/modules/admin-core/src/i18n/admin_index.en
@@ -13,10 +13,6 @@ team   = "The FFLuCI Team"
 luci1 = "Here you can customize the settings and the functionality of FFLuCI."
 language = "Language"
 general = "General"
-catpriv = "Category Privileges"
-catpriv1 = [[To secure FFLuCI even further the user and group privileges of
-each category can be decreased. Therefore an attacker cannot takeover the whole system
-when a security exploit for any publicly available page is found.]]
 ucicommit = "Post-commit actions"
 ucicommit1 = [[These commands will be executed automatically when a given UCI configuration is committed allowing
 changes to be applied instantly.]]
diff --git a/modules/admin-core/src/model/cbi/admin_index/luci.lua b/modules/admin-core/src/model/cbi/admin_index/luci.lua
index 4f6910eeec..e541d4ec87 100644
--- a/modules/admin-core/src/model/cbi/admin_index/luci.lua
+++ b/modules/admin-core/src/model/cbi/admin_index/luci.lua
@@ -19,12 +19,6 @@ for k, v in pairs(ffluci.config.themes) do
 	end
 end
 
-p = m:section(NamedSection, "category_privileges", "core", translate("catpriv", "Kategorieprivilegien"),
- translate("catpriv1", [[Zur zusätzlichen Sicherung der Oberfläche gegen Angreifer, können hier die
-Ausführungsrechte der Seiten für einzelne Kategorien reduziert werden. So können z.B. Sicherheitslücken im
-ungeschützten Bereich der Oberfläche nicht mehr zur Übernahme des Routers genutzt werden.]]))
-p.dynamic = true
-
 u = m:section(NamedSection, "uci_oncommit", "event", translate("ucicommit", "UCI-Befehle beim Anwenden"),
  translate("ucicommit1", [[Beim Anwenden
 der Konfiguration aus der Oberflächliche heraus können automatisch die relevanten Dienste neugestart werden,
diff --git a/modules/admin-core/src/model/menu/00admin.lua b/modules/admin-core/src/model/menu/00admin.lua
deleted file mode 100644
index b21e5e338e..0000000000
--- a/modules/admin-core/src/model/menu/00admin.lua
+++ /dev/null
@@ -1,36 +0,0 @@
-add("admin", "index", "Übersicht", 10)
-act("luci", "Oberfläche")
-
-add("admin", "status", "Status", 20)
-act("syslog", "Systemprotokoll")
-
-add("admin", "system", "System", 30)
-act("packages", "Paketverwaltung")
-act("passwd", "Passwort ändern")
-act("sshkeys", "SSH-Schlüssel")
-act("hostname", "Hostname")
-act("fstab", "Einhängepunkte")
-act("upgrade", "Firmwareupgrade")
-act("reboot", "Neu starten")
-
-add("admin", "services", "Dienste", 40)
-if isfile("/etc/config/olsr") then
-	act("olsrd", "OLSR")
-end
-act("httpd", "HTTP-Server")
-act("dropbear", "SSH-Server")
-act("dnsmasq", "Dnsmasq")
-
-add("admin", "network", "Netzwerk", 50)
-act("vlan", "Switch")
-act("ifaces", "Schnittstellen")
-act("dhcp", "DHCP-Server")
-act("ptp", "PPPoE / PPTP")
-act("routes", "Statische Routen")
-if isfile("/etc/config/qos") then
-	act("qos", "Quality of Service")
-end
-
-add("admin", "wifi", "Drahtlos", 60)
-act("devices", "Geräte")
-act("networks", "Netze")
\ No newline at end of file
diff --git a/modules/freifunk/src/controller/admin/index/wizard.lua b/modules/freifunk/src/controller/freifunk/freifunk.lua
index efca38d21b..e73ec263cb 100644
--- a/modules/freifunk/src/controller/admin/index/wizard.lua
+++ b/modules/freifunk/src/controller/freifunk/freifunk.lua
@@ -1,6 +1,79 @@
-module("ffluci.controller.admin.index.wizard", package.seeall)
+module("ffluci.controller.freifunk.freifunk", package.seeall)
 
-function action()
+function index()
+	local page  = node()
+	page.target = alias("freifunk")
+
+	local page    = node("freifunk")
+	page.title    = "Freifunk"
+	page.target   = alias("freifunk", "index")
+	page.order    = 5
+	page.setuser  = "nobody"
+	page.setgroup = "nogroup"
+	
+	local page  = node("freifunk", "index")
+	page.target = template("freifunk/index")
+	page.title  = "Übersicht"
+	page.order  = 10
+	
+	local page  = node("freifunk", "index", "contact")
+	page.target = template("freifunk/contact")
+	page.title  = "Kontakt"
+	
+	
+	local page  = node("freifunk", "status")
+	page.target = action_status
+	page.title  = "Status"
+	page.order  = 20
+	page.setuser  = false
+	page.setgroup = false
+
+	local page  = node("freifunk", "status", "routes")
+	page.target = template("public_status/routes")
+	page.title  = "Routingtabelle"
+	page.order  = 10
+	
+	local page  = node("freifunk", "status", "iwscan")
+	page.target = template("public_status/iwscan")
+	page.title  = "WLAN-Scan"
+	page.order  = 20	
+
+
+	local page  = node("admin", "index", "wizard")
+	page.target = action_wizard
+	page.title  = "Freifunkassistent"
+	page.order  = 20
+	
+	local page  = node("admin", "index", "freifunk")
+	page.target = cbi("freifunk/freifunk")
+	page.title  = "Freifunk"
+	page.order  = 30
+	
+	local page  = node("admin", "index", "contact")
+	page.target = cbi("freifunk/contact")
+	page.title  = "Kontakt"
+	page.order  = 40
+end
+
+function action_status()
+	local data = {}
+	
+	data.s, data.m, data.r = ffluci.sys.sysinfo()
+	
+	data.wifi = ffluci.sys.wifi.getiwconfig()
+	
+	data.routes = {}
+	for i, r in pairs(ffluci.sys.net.routes()) do
+		if r.Destination == "00000000" then
+			table.insert(data.routes, r)
+		end
+	end
+
+	
+	ffluci.template.render("public_status/index", data)
+end
+
+function action_wizard()
 	if ffluci.http.formvalue("ip") then
 		return configure_freifunk()
 	end
@@ -16,7 +89,7 @@ function action()
 		end
 	end
 	
-	ffluci.template.render("admin_index/wizard", {ifaces=ifaces})
+	ffluci.template.render("freifunk/wizard", {ifaces=ifaces})
 end
 
 function configure_freifunk()
diff --git a/modules/freifunk/src/controller/rpc/luciinfo.lua b/modules/freifunk/src/controller/freifunk/luciinfo.lua
index 611423fbb0..bc45898d9c 100644
--- a/modules/freifunk/src/controller/rpc/luciinfo.lua
+++ b/modules/freifunk/src/controller/freifunk/luciinfo.lua
@@ -1,4 +1,8 @@
-module("ffluci.controller.rpc.luciinfo", package.seeall)
+module("ffluci.controller.freifunk.luciinfo", package.seeall)
+
+function index()
+	node("freifunk", "luciinfo").target = action_index
+end
 
 function action_index()
 	local uci = ffluci.model.uci.StateSession()
@@ -7,7 +11,7 @@ function action_index()
 	
 	-- General
 	print("luciinfo.api=1")
-	print("luciinfo.version=" .. tostring(ffluci.__version__))
+	print("luciinfo.version=" .. tostring(require("ffluci").__version__))
 	
 	-- Sysinfo
 	local s, m, r = ffluci.sys.sysinfo()
@@ -28,11 +32,11 @@ function action_index()
 	-- Freifunk
 	local ff = uci:sections("freifunk") or {}
 	for k, v in pairs(ff) do
-		if k:sub(1, 1) ~= "." then
 			for i, j in pairs(v) do
-				print("freifunk." .. k .. "." .. i .. "=" .. j)
+				if i:sub(1, 1) ~= "." then
+					print("freifunk." .. k .. "." .. i .. "=" .. j)
+				end
 			end
-		end
 	end
 end
 
diff --git a/modules/freifunk/src/controller/public/olsr.lua b/modules/freifunk/src/controller/freifunk/olsr.lua
index d41f5ed41d..6031cd4317 100644
--- a/modules/freifunk/src/controller/public/olsr.lua
+++ b/modules/freifunk/src/controller/freifunk/olsr.lua
@@ -1,11 +1,38 @@
-module("ffluci.controller.public.olsr", package.seeall)
+module("ffluci.controller.freifunk.olsr", package.seeall)
 require("ffluci.sys")
 
+function index()
+	local page  = node("freifunk", "olsr")
+	page.target = action_index
+	page.title  = "OLSR"
+	page.order  = 30
+	
+	local page  = node("freifunk", "olsr", "routes")
+	page.target = action_routes
+	page.title  = "Routen"
+	page.order  = 10
+	
+	local page  = node("freifunk", "olsr", "topology")
+	page.target = action_topology
+	page.title  = "Topologie"
+	page.order  = 20
+	
+	local page  = node("freifunk", "olsr", "hna")
+	page.target = action_hna
+	page.title  = "HNA"
+	page.order  = 30
+	
+	local page  = node("freifunk", "olsr", "mid")
+	page.target = action_mid
+	page.title  = "MID"
+	page.order  = 50
+end
+
 function action_index()
 	local data = fetch_txtinfo("links")
 	
 	if not data or not data.Links then
-		ffluci.template.render("public_olsr/error_olsr")
+		ffluci.template.render("freifunk-olsr/error_olsr")
 		return nil
 	end
 	
@@ -23,14 +50,14 @@ function action_index()
 	
 	table.sort(data.Links, compare)
 	
-	ffluci.template.render("public_olsr/index", {links=data.Links})
+	ffluci.template.render("freifunk-olsr/index", {links=data.Links})
 end
 
 function action_routes()
 	local data = fetch_txtinfo("routes")
 	
 	if not data or not data.Routes then
-		ffluci.template.render("public_olsr/error_olsr")
+		ffluci.template.render("freifunk-olsr/error_olsr")
 		return nil
 	end
 	
@@ -48,14 +75,14 @@ function action_routes()
 	
 	table.sort(data.Routes, compare)
 	
-	ffluci.template.render("public_olsr/routes", {routes=data.Routes})
+	ffluci.template.render("freifunk-olsr/routes", {routes=data.Routes})
 end
 
 function action_topology()
 	local data = fetch_txtinfo("topology")
 	
 	if not data or not data.Topology then
-		ffluci.template.render("public_olsr/error_olsr")
+		ffluci.template.render("freifunk-olsr/error_olsr")
 		return nil
 	end
 	
@@ -65,14 +92,14 @@ function action_topology()
 	
 	table.sort(data.Topology, compare)
 	
-	ffluci.template.render("public_olsr/topology", {routes=data.Topology})
+	ffluci.template.render("freifunk-olsr/topology", {routes=data.Topology})
 end
 
 function action_hna()
 	local data = fetch_txtinfo("hna")
 	
 	if not data or not data.HNA then
-		ffluci.template.render("public_olsr/error_olsr")
+		ffluci.template.render("freifunk-olsr/error_olsr")
 		return nil
 	end
 	
@@ -82,14 +109,14 @@ function action_hna()
 	
 	table.sort(data.HNA, compare)
 	
-	ffluci.template.render("public_olsr/hna", {routes=data.HNA})
+	ffluci.template.render("freifunk-olsr/hna", {routes=data.HNA})
 end
 
 function action_mid()
 	local data = fetch_txtinfo("mid")
 	
 	if not data or not data.MID then
-		ffluci.template.render("public_olsr/error_olsr")
+		ffluci.template.render("freifunk-olsr/error_olsr")
 		return nil
 	end
 	
@@ -99,7 +126,7 @@ function action_mid()
 	
 	table.sort(data.MID, compare)
 	
-	ffluci.template.render("public_olsr/mid", {mids=data.MID})
+	ffluci.template.render("freifunk-olsr/mid", {mids=data.MID})
 end
 
 
diff --git a/modules/freifunk/src/controller/public/index.lua b/modules/freifunk/src/controller/public/index.lua
deleted file mode 100644
index f65478c05f..0000000000
--- a/modules/freifunk/src/controller/public/index.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.public.index", package.seeall)
\ No newline at end of file
diff --git a/modules/freifunk/src/controller/public/status.lua b/modules/freifunk/src/controller/public/status.lua
deleted file mode 100644
index 8d2f7a303f..0000000000
--- a/modules/freifunk/src/controller/public/status.lua
+++ /dev/null
@@ -1,21 +0,0 @@
-module("ffluci.controller.public.status", package.seeall)
-
-function action_index()
-	local data = {}
-	
-	data.s, data.m, data.r = ffluci.sys.sysinfo()
-	
-	data.wifi = ffluci.sys.wifi.getiwconfig()
-	
-	data.routes = {}
-	for i, r in pairs(ffluci.sys.net.routes()) do
-		if r.Destination == "00000000" then
-			table.insert(data.routes, r)
-		end
-	end
-
-	
-	ffluci.template.render("public_status/index", data)
-end
-
-
diff --git a/modules/freifunk/src/controller/sudo/status.lua b/modules/freifunk/src/controller/sudo/status.lua
deleted file mode 100644
index fd5127d2cf..0000000000
--- a/modules/freifunk/src/controller/sudo/status.lua
+++ /dev/null
@@ -1 +0,0 @@
-module("ffluci.controller.sudo.status", package.seeall)
\ No newline at end of file
diff --git a/modules/freifunk/src/model/cbi/admin_index/contact.lua b/modules/freifunk/src/model/cbi/freifunk/contact.lua
index 66a1ec4bde..66a1ec4bde 100644
--- a/modules/freifunk/src/model/cbi/admin_index/contact.lua
+++ b/modules/freifunk/src/model/cbi/freifunk/contact.lua
diff --git a/modules/freifunk/src/model/cbi/admin_index/freifunk.lua b/modules/freifunk/src/model/cbi/freifunk/freifunk.lua
index fe9e285b49..fe9e285b49 100644
--- a/modules/freifunk/src/model/cbi/admin_index/freifunk.lua
+++ b/modules/freifunk/src/model/cbi/freifunk/freifunk.lua
diff --git a/modules/freifunk/src/model/menu/10freifunk.lua b/modules/freifunk/src/model/menu/10freifunk.lua
deleted file mode 100644
index 3adbe89858..0000000000
--- a/modules/freifunk/src/model/menu/10freifunk.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-add("public", "index", "Übersicht", 10)
-act("contact", "Kontakt")
-
-add("public", "status", "Status", 20)
-act("routes", "Routingtabelle")
-act("iwscan", "WLAN-Scan")
-
-add("public", "olsr", "OLSR", 30)
-act("routes", "Routen")
-act("topology", "Topologie")
-act("hna", "HNA")
-act("mid", "MID")
-
-
-sel("admin", "index")
-act("wizard", "Freifunkassistent")
-act("contact", "Kontakt")
-act("freifunk", "Freifunk")
\ No newline at end of file
diff --git a/modules/freifunk/src/view/public_olsr/error_olsr.htm b/modules/freifunk/src/view/freifunk-olsr/error_olsr.htm
index 25426f50d7..25426f50d7 100644
--- a/modules/freifunk/src/view/public_olsr/error_olsr.htm
+++ b/modules/freifunk/src/view/freifunk-olsr/error_olsr.htm
diff --git a/modules/freifunk/src/view/public_olsr/hna.htm b/modules/freifunk/src/view/freifunk-olsr/hna.htm
index c13369f426..c13369f426 100644
--- a/modules/freifunk/src/view/public_olsr/hna.htm
+++ b/modules/freifunk/src/view/freifunk-olsr/hna.htm
diff --git a/modules/freifunk/src/view/public_olsr/index.htm b/modules/freifunk/src/view/freifunk-olsr/index.htm
index 0633d1f456..0633d1f456 100644
--- a/modules/freifunk/src/view/public_olsr/index.htm
+++ b/modules/freifunk/src/view/freifunk-olsr/index.htm
diff --git a/modules/freifunk/src/view/public_olsr/mid.htm b/modules/freifunk/src/view/freifunk-olsr/mid.htm
index 6553237ea5..6553237ea5 100644
--- a/modules/freifunk/src/view/public_olsr/mid.htm
+++ b/modules/freifunk/src/view/freifunk-olsr/mid.htm
diff --git a/modules/freifunk/src/view/public_olsr/routes.htm b/modules/freifunk/src/view/freifunk-olsr/routes.htm
index f3a0fd3366..f3a0fd3366 100644
--- a/modules/freifunk/src/view/public_olsr/routes.htm
+++ b/modules/freifunk/src/view/freifunk-olsr/routes.htm
diff --git a/modules/freifunk/src/view/public_olsr/topology.htm b/modules/freifunk/src/view/freifunk-olsr/topology.htm
index c622026d48..c622026d48 100644
--- a/modules/freifunk/src/view/public_olsr/topology.htm
+++ b/modules/freifunk/src/view/freifunk-olsr/topology.htm
diff --git a/modules/freifunk/src/view/public_index/contact.htm b/modules/freifunk/src/view/freifunk/contact.htm
index 221dc89ccc..221dc89ccc 100644
--- a/modules/freifunk/src/view/public_index/contact.htm
+++ b/modules/freifunk/src/view/freifunk/contact.htm
diff --git a/modules/freifunk/src/view/public_index/index.htm b/modules/freifunk/src/view/freifunk/index.htm
index 6c7fe85883..6c7fe85883 100644
--- a/modules/freifunk/src/view/public_index/index.htm
+++ b/modules/freifunk/src/view/freifunk/index.htm
diff --git a/modules/freifunk/src/view/admin_index/wizard.htm b/modules/freifunk/src/view/freifunk/wizard.htm
index b08703ffec..b08703ffec 100644
--- a/modules/freifunk/src/view/admin_index/wizard.htm
+++ b/modules/freifunk/src/view/freifunk/wizard.htm
diff --git a/modules/freifunk/src/view/public_status/index.htm b/modules/freifunk/src/view/public_status/index.htm
index be0b96888b..3ea120c1e8 100644
--- a/modules/freifunk/src/view/public_status/index.htm
+++ b/modules/freifunk/src/view/public_status/index.htm
@@ -34,7 +34,25 @@
 <th><%:signal Signal%></th>
 <th><%:noise Rausch%></th>
 </tr>
-<%=ffluci.sys.httpget("http://127.0.0.1" .. controller .. "/sudo/status/iwconfig")%>
+<%for k, v in pairs(ffluci.sys.wifi.getiwconfig()) do
+%>
+<tr>
+<td rowspan="2"><%=k%></td>
+<td><%=v[1]%></td>
+<td><%=v.Frequency%></td>
+<td><%=v["Tx-Power"]%></td>
+<td><%=v["Bit Rate"]%></td>
+<td><%=v["RTS thr"]%></td>
+<td><%=v["Fragment thr"]%></td>
+<td><%=v["Link Quality"]%></td>
+<td><%=v["Signal level"]%></td>
+<td><%=v["Noise level"]%></td>
+</tr>
+<tr>
+<td colspan="4"><strong>ESSID: </strong><%=v.ESSID%></td>
+<td colspan="5"><strong>BSSID: </strong><%=(v.Cell or v["Access Point"])%></td>
+</tr>
+<%end%>
 </table>
 <br />
 <br />
diff --git a/modules/freifunk/src/view/public_status/iwscan.htm b/modules/freifunk/src/view/public_status/iwscan.htm
index a8924c8925..c5acdb9acc 100644
--- a/modules/freifunk/src/view/public_status/iwscan.htm
+++ b/modules/freifunk/src/view/public_status/iwscan.htm
@@ -15,7 +15,24 @@
 <th><%:signal Signal%></th>
 <th><%:noise Rausch%></th>
 </tr>
-<%=ffluci.sys.httpget("http://127.0.0.1" .. controller .. "/sudo/status/iwscan")%>
+<%for iface, cells in pairs(ffluci.sys.wifi.iwscan()) do
+	for i, cell in ipairs(cells) do 
+%>
+<tr>
+<td><%=iface%></td>
+<td><%=cell.ESSID%></td>
+<td><%=cell.Address%></td>
+<td><%=cell.Mode%></td>
+<td><%=(cell.Channel or cell.Frequency or "")%></td>
+<td><%=cell["Encryption key"]%></td>
+<td><%=cell.Quality%></td>
+<td><%=cell["Signal level"]%></td>
+<td><%=cell["Noise level"]%></td>
+</tr>
+<%
+	end
+end
+%>
 </table>
 <br />
 <%+footer%>
\ No newline at end of file
diff --git a/modules/freifunk/src/view/sudo_status/iwconfig.htm b/modules/freifunk/src/view/sudo_status/iwconfig.htm
deleted file mode 100644
index 6f5dede700..0000000000
--- a/modules/freifunk/src/view/sudo_status/iwconfig.htm
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-ffluci.http.prepare_content("text/plain")
-for k, v in pairs(ffluci.sys.wifi.getiwconfig()) do
-%>
-<tr>
-<td rowspan="2"><%=k%></td>
-<td><%=v[1]%></td>
-<td><%=v.Frequency%></td>
-<td><%=v["Tx-Power"]%></td>
-<td><%=v["Bit Rate"]%></td>
-<td><%=v["RTS thr"]%></td>
-<td><%=v["Fragment thr"]%></td>
-<td><%=v["Link Quality"]%></td>
-<td><%=v["Signal level"]%></td>
-<td><%=v["Noise level"]%></td>
-</tr>
-<tr>
-<td colspan="4"><strong>ESSID: </strong><%=v.ESSID%></td>
-<td colspan="5"><strong>BSSID: </strong><%=(v.Cell or v["Access Point"])%></td>
-</tr>
-<%end%>
diff --git a/modules/freifunk/src/view/sudo_status/iwscan.htm b/modules/freifunk/src/view/sudo_status/iwscan.htm
deleted file mode 100644
index 6f321ae9e2..0000000000
--- a/modules/freifunk/src/view/sudo_status/iwscan.htm
+++ /dev/null
@@ -1,22 +0,0 @@
-<%
-ffluci.http.prepare_content("text/plain")
-for iface, cells in pairs(ffluci.sys.wifi.iwscan()) do
-	for i, cell in ipairs(cells) do 
-%>
-<tr>
-<td><%=iface%></td>
-<td><%=cell.ESSID%></td>
-<td><%=cell.Address%></td>
-<td><%=cell.Mode%></td>
-<td><%=(cell.Channel or cell.Frequency or "")%></td>
-<td><%=cell["Encryption key"]%></td>
-<td><%=cell.Quality%></td>
-<td><%=cell["Signal level"]%></td>
-<td><%=cell["Noise level"]%></td>
-</tr>
-<%
-	end
-end
-%>
-
-