modules/admin-full: merge services/dnsmasq and network/dhcpleases into network/dhcp
[project/luci.git] / modules / admin-full / luasrc / controller / admin / network.lua
index badb696..76d4320 100644 (file)
@@ -67,7 +67,7 @@ function index()
                        local wnet
                        for _, wnet in ipairs(wdev:get_wifinets()) do
                                entry(
                        local wnet
                        for _, wnet in ipairs(wdev:get_wifinets()) do
                                entry(
-                                       {"admin", "network", "wireless", wnet.netid},
+                                       {"admin", "network", "wireless", wnet:id()},
                                        alias("admin", "network", "wireless"),
                                        wdev:name() .. ": " .. wnet:shortname()
                                )
                                        alias("admin", "network", "wireless"),
                                        wdev:name() .. ": " .. wnet:shortname()
                                )
@@ -106,9 +106,9 @@ function index()
        )
 
        if nixio.fs.access("/etc/config/dhcp") then
        )
 
        if nixio.fs.access("/etc/config/dhcp") then
-               page = node("admin", "network", "dhcpleases")
-               page.target = cbi("admin_network/dhcpleases")
-               page.title  = i18n("DHCP Leases")
+               page = node("admin", "network", "dhcp")
+               page.target = cbi("admin_network/dhcp")
+               page.title  = i18n("DHCP and DNS")
                page.order  = 30
 
                page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
                page.order  = 30
 
                page = entry({"admin", "network", "dhcplease_status"}, call("lease_status"), nil)
@@ -207,7 +207,7 @@ function iface_status()
        local rv   = { }
 
        local iface
        local rv   = { }
 
        local iface
-       for iface in path[#path]:gmatch("[%w%.%-]+") do
+       for iface in path[#path]:gmatch("[%w%.%-_]+") do
                local net = netm:get_network(iface)
                if net then
                        local info
                local net = netm:get_network(iface)
                if net then
                        local info