modules/admin-full: speed up network controller by using inreq flag

modules/admin-full/luasrc/controller/admin/network.lua

@@ -17,16 +17,6 @@ module("luci.controller.admin.network", package.seeall)
 
 function index()
 	local uci = require("luci.model.uci").cursor()
-	local net = require "luci.model.network".init(uci)
-	local has_wifi = nixio.fs.stat("/etc/config/wireless")
-	local has_switch = false
-
-	uci:foreach("network", "switch",
-		function(s)
-			has_switch = true
-			return false
-		end
-	)
 
 	local page
 
@@ -36,6 +26,15 @@ function index()
 	page.order  = 50
 	page.index  = true
 
+	if page.inreq then
+		local has_switch = false
+
+		uci:foreach("network", "switch",
+			function(s)
+				has_switch = true
+				return false
+			end)
+
 		if has_switch then
 			page  = node("admin", "network", "vlan")
 			page.target = cbi("admin_network/vlan")
@@ -43,11 +42,16 @@ function index()
 			page.order  = 20
 		end
 
-	if has_wifi and has_wifi.size > 0 then
-		page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
-		page.leaf = true
-		page.subindex = true
 
+		local has_wifi = false
+		
+		uci:foreach("wireless", "wifi-device",
+			function(s)
+				has_wifi = true
+				return false
+			end)
+		
+		if has_wifi then
 			page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil)
 			page.leaf = true
 
@@ -66,7 +70,13 @@ function index()
 			page = entry({"admin", "network", "wireless_shutdown"}, call("wifi_reconnect"), nil)
 			page.leaf = true
 
+			page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wifi"), 15)
+			page.leaf = true
+			page.subindex = true
+
+			if page.inreq then
 				local wdev
+				local net = require "luci.model.network".init(uci)
 				for _, wdev in ipairs(net:get_wifidevs()) do
 					local wnet
 					for _, wnet in ipairs(wdev:get_wifinets()) do
@@ -78,10 +88,8 @@ function index()
 					end
 				end
 			end
+		end
 
-	page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10)
-	page.leaf   = true
-	page.subindex = true
 
 		page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil)
 		page.leaf = true
@@ -98,16 +106,21 @@ function index()
 		page = entry({"admin", "network", "iface_shutdown"}, call("iface_shutdown"), nil)
 		page.leaf = true
 
+		page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10)
+		page.leaf   = true
+		page.subindex = true
+
+		if page.inreq then
 			uci:foreach("network", "interface",
 				function (section)
 					local ifc = section[".name"]
 					if ifc ~= "loopback" then
 						entry({"admin", "network", "network", ifc},
-				 true,
+						true, ifc:upper())
-				 ifc:upper())
 					end
+				end)
 		end
-	)
+
 
 		if nixio.fs.access("/etc/config/dhcp") then
 			page = node("admin", "network", "dhcp")
@@ -143,6 +156,7 @@ function index()
 		page = entry({"admin", "network", "diag_traceroute"}, call("diag_traceroute"), nil)
 		page.leaf = true
 	end
+end
 
 function wifi_join()
 	local function param(x)