X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=inline;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fnetwork.lua;h=fe60e7898a91d505cd810baf62eb088f66cd2c80;hb=72e3b2c7e5766cad42b7e4cf9ab0b3e3f3c7328e;hp=a5cc2c28498287ceacee90d9f32531b3a27c20af;hpb=f5a760168b3dba6b9b0d5d93ab6b6ed4e229cb73;p=project%2Fluci.git diff --git a/modules/admin-full/luasrc/controller/admin/network.lua b/modules/admin-full/luasrc/controller/admin/network.lua index a5cc2c284..fe60e7898 100644 --- a/modules/admin-full/luasrc/controller/admin/network.lua +++ b/modules/admin-full/luasrc/controller/admin/network.lua @@ -17,6 +17,15 @@ function index() require("luci.i18n") local uci = require("luci.model.uci").cursor() local i18n = luci.i18n.translate + 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 = node("admin", "network") page.target = alias("admin", "network", "network") @@ -24,20 +33,27 @@ function index() page.order = 50 page.index = true - local page = node("admin", "network", "vlan") - page.target = cbi("admin_network/vlan") - page.title = i18n("Switch") - page.order = 20 + if has_switch then + local page = node("admin", "network", "vlan") + page.target = cbi("admin_network/vlan") + page.title = i18n("Switch") + page.order = 20 + end - local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15) - page.leaf = true - page.subindex = true + if has_wifi and has_wifi.size > 0 then + local page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), i18n("Wifi"), 15) + page.leaf = true + page.subindex = true - local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16) - page.leaf = true + local page = entry({"admin", "network", "wireless_join"}, call("wifi_join"), nil, 16) + page.leaf = true - local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16) - page.leaf = true + local page = entry({"admin", "network", "wireless_add"}, call("wifi_add"), nil, 16) + page.leaf = true + + local page = entry({"admin", "network", "wireless_delete"}, call("wifi_delete"), nil, 16) + page.leaf = true + end local page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), i18n("Interfaces"), 10) page.leaf = true @@ -57,17 +73,12 @@ function index() end ) - local page = node("admin", "network", "dhcp") - page.target = cbi("admin_network/dhcp") - page.title = "DHCP" - page.order = 30 - page.subindex = true - - entry( - {"admin", "network", "dhcp", "leases"}, - cbi("admin_network/dhcpleases"), - i18n("Leases") - ) + if nixio.fs.access("/etc/config/dhcp") then + local page = node("admin", "network", "dhcpleases") + page.target = cbi("admin_network/dhcpleases") + page.title = i18n("DHCP Leases") + page.order = 30 + end local page = node("admin", "network", "hosts") page.target = cbi("admin_network/hosts") @@ -95,80 +106,46 @@ function wifi_join() local ssid = param("join") if dev and ssid then - local wep = (tonumber(param("wep")) == 1) - local wpa = tonumber(param("wpa_version")) or 0 - local channel = tonumber(param("channel")) - local mode = param("mode") - local bssid = param("bssid") - - local confirm = (param("confirm") == "1") - local cancel = param("cancel") and true or false - - if confirm and not cancel then - local fixed_bssid = (param("fixed_bssid") == "1") - local replace_net = (param("replace_net") == "1") - local autoconnect = (param("autoconnect") == "1") - local attach_intf = param("attach_intf") - - local uci = require "luci.model.uci".cursor() - - if replace_net then - uci:delete_all("wireless", "wifi-iface") - end - - local wificonf = { - device = dev, - mode = (mode == "Ad-Hoc" and "adhoc" or "sta"), - ssid = ssid - } - - if attach_intf and uci:get("network", attach_intf) == "interface" then - -- target network already has a interface, make it a bridge - uci:set("network", attach_intf, "type", "bridge") - uci:save("network") - uci:commit("network") + local cancel = (param("cancel") or param("cbi.cancel")) and true or false - wificonf.network = attach_intf - - if autoconnect then - require "luci.sys".call("/sbin/ifup " .. attach_intf) - end - end - - if fixed_bssid then - wificonf.bssid = bssid - end - - if wep then - wificonf.encryption = "wep" - wificonf.key = param("key") - elseif wpa > 0 then - wificonf.encryption = param("wpa_suite") - wificonf.key = param("key") - end - - local s = uci:section("wireless", "wifi-iface", nil, wificonf) - uci:delete("wireless", dev, "disabled") - uci:set("wireless", dev, "channel", channel) - - uci:save("wireless") - uci:commit("wireless") - - if autoconnect then - require "luci.sys".call("/sbin/wifi") - end - - luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless")) - elseif cancel then + if cancel then luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless_join?device=" .. dev)) else - luci.template.render("admin_network/wifi_join_settings") + local cbi = require "luci.cbi" + local tpl = require "luci.template" + local map = luci.cbi.load("admin_network/wifi_add")[1] + + if map:parse() ~= cbi.FORM_DONE then + tpl.render("header") + map:render() + tpl.render("footer") + end end else luci.template.render("admin_network/wifi_join") end end +function wifi_add() + local dev = luci.http.formvalue("device") + local uci = require "luci.model.uci".cursor() + local wlm = require "luci.model.wireless" + + if dev then + wlm.init(uci) + + local net = wlm:add_network({ + device = dev, + mode = "ap", + ssid = "OpenWrt", + encryption = "none" + }) + + uci:save("wireless") + luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", dev, net:name())) + end +end + function wifi_delete(network) local uci = require "luci.model.uci".cursor() local wlm = require "luci.model.wireless"