t2 = m:section(Table, {}, translate("iwscan"), translate("iwscan1"))
function scan.write(self, section)
+ m.autoapply = false
t2.render = t2._render
local ifname = self.map:get(section, "ifname")
luci.util.update(t2.data, luci.sys.wifi.iwscan(ifname))
-- Config Section --
s = m:section(NamedSection, wifidevs[1], "wifi-device", translate("devices"))
+s.addremove = false
en = s:option(Flag, "disabled", translate("enable"))
en.enabled = "0"
local hwtype = m:get(wifidevs[1], "type")
if hwtype == "atheros" then
- mode = s:option(ListValue, "mode", translate("mode"))
+ mode = s:option(ListValue, "hwmode", translate("mode"))
+ mode.override_values = true
mode:value("", "auto")
mode:value("11b", "802.11b")
mode:value("11g", "802.11g")
s = m:section(TypedSection, "wifi-iface", translate("m_n_local"))
s.anonymous = true
+s.addremove = false
s:option(Value, "ssid", translate("a_w_netid"))
end
mode = s:option(ListValue, "mode", translate("mode"))
+mode.override_values = true
mode:value("ap", translate("m_w_ap"))
mode:value("adhoc", translate("m_w_adhoc"))
mode:value("sta", translate("m_w_client"))
end
encr = s:option(ListValue, "encryption", translate("encryption"))
-encr:value("none", "keine")
+encr.override_values = true
+encr:value("none", "No Encryption")
encr:value("wep", "WEP")
-encr:value("psk", "WPA-PSK")
-encr:value("wpa", "WPA-Radius", {mode="ap"})
-encr:value("psk2", "WPA2-PSK")
-encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
+
+if hwtype == "atheros" or hwtype == "mac80211" then
+ local supplicant = luci.fs.mtime("/usr/sbin/wpa_supplicant")
+ local hostapd = luci.fs.mtime("/usr/sbin/hostapd")
+
+ if hostapd and supplicant then
+ encr:value("psk", "WPA-PSK")
+ encr:value("psk2", "WPA2-PSK")
+ encr:value("wpa", "WPA-Radius", {mode="ap"})
+ encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
+ 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("wpa", "WPA-Radius", {mode="ap"})
+ encr:value("wpa2i", "WPA2-Radius", {mode="ap"})
+ encr.description = translate("wifi_wpareq")
+ elseif not hostapd and supplicant then
+ encr:value("psk", "WPA-PSK", {mode="sta"})
+ encr:value("psk2", "WPA2-PSK", {mode="sta"})
+ encr.description = translate("wifi_wpareq")
+ else
+ encr.description = translate("wifi_wpareq")
+ end
+elseif hwtype == "broadcom" then
+ encr:value("psk", "WPA-PSK")
+ encr:value("psk2", "WPA2-PSK")
+end
key = s:option(Value, "key", translate("key"))
key:depends("encryption", "wep")