luci-app-travelmate: sync with 1.0.1

[project/luci.git] / applications / luci-app-travelmate / luasrc / model / cbi / travelmate / wifi_add.lua

diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
index 3186947..1e8bd7e 100644 (file)
--- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
+++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
@@ -1,10 +1,12 @@
--- Copyright 2017 Dirk Brenken (dev@brenken.org)
+-- Copyright 2017-2018 Dirk Brenken (dev@brenken.org)
 -- This is free software, licensed under the Apache License, Version 2.0
 
 local fs       = require("nixio.fs")
 local uci      = require("luci.model.uci").cursor()
 local http     = require("luci.http")
 local trmiface = uci.get("travelmate", "global", "trm_iface") or "trm_wwan"
+local encr_psk = {"psk", "psk2", "psk-mixed"}
+local encr_wpa = {"wpa", "wpa2", "wpa-mixed"}
 
 m = SimpleForm("add", translate("Add Wireless Uplink Configuration"))
 m.submit = translate("Save")
@@ -32,7 +34,11 @@ else
        wssid = m:field(Value, "ssid", translate("SSID (hidden)"))
 end
 
+nobssid = m:field(Flag, "no_bssid", translate("Ignore BSSID"))
+nobssid.default = nobssid.enabled
+
 bssid = m:field(Value, "bssid", translate("BSSID"))
+bssid:depends("no_bssid", 0)
 bssid.datatype = "macaddr"
 bssid.default = m.hidden.bssid or ""
 
@@ -53,7 +59,7 @@ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
                encr:value("psk", "WPA PSK")
                encr:value("psk-mixed", "WPA/WPA2 mixed")
                encr:value("psk2", "WPA2 PSK")
-               encr.default = "psk2"
+               encr.default = encr_psk[tonumber(m.hidden.wpa_version)] or "psk2"
 
                ciph = m:field(ListValue, "cipher", translate("Cipher"))
                ciph:value("auto", translate("Automatic"))
@@ -70,7 +76,7 @@ elseif (tonumber(m.hidden.wpa_version) or 0) > 0 then
                encr:value("wpa", "WPA Enterprise")
                encr:value("wpa-mixed", "WPA/WPA2 Enterprise mixed")
                encr:value("wpa2", "WPA2 Enterprise")
-               encr.default = "wpa2"
+               encr.default = encr_wpa[tonumber(m.hidden.wpa_version)] or "wpa2"
 
                ciph = m:field(ListValue, "cipher", translate("Cipher"))
                ciph:value("auto", translate("Automatic"))
@@ -131,7 +137,7 @@ function wssid.write(self, section, value)
                bssid    = bssid:formvalue(section),
                disabled = "1"
        })
-       
+
        if (tonumber(m.hidden.wep) or 0) == 1 then
                uci:set("wireless", newsection, "encryption", encr:formvalue(section))
                uci:set("wireless", newsection, "key", wkey:formvalue(section) or "")