From 9c51bbc48b44eca376f7cfad5c118cd003e0f6e8 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Wed, 23 Oct 2019 10:42:38 +0200 Subject: [PATCH] luci-app-travelmate: WEP-fixes * fix some more WEP-related form issues Signed-off-by: Dirk Brenken (cherry picked from commit 9a47552bd938985879d727e1e28cd34df57de604) --- .../luasrc/model/cbi/travelmate/wifi_add.lua | 2 ++ .../luasrc/model/cbi/travelmate/wifi_edit.lua | 2 ++ 2 files changed, 4 insertions(+) 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 e0d0cedd7..c93fdd256 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua @@ -172,6 +172,8 @@ cmd_list.default = cmd or "none" cmd_args.default = cmd_args_default function wssid.write(self, section, value) + login_section = (m.hidden.device or "") .. "_" .. (wssid:formvalue(section) or "") .. "_" .. (bssid:formvalue(section) or "") + login_section = login_section:gsub("[^%w_]", "_") newsection = uci:section("wireless", "wifi-iface", login_section, { mode = "sta", network = trmiface, diff --git a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua index 086853171..6c0a3e186 100644 --- a/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua +++ b/applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua @@ -48,6 +48,8 @@ if s ~= nil then wkey = m:field(Value, "key", translate("Passphrase")) wkey.datatype = "wepkey" + wkey.password = true + wkey.default = s.key elseif string.match(s.encryption, '^wpa') then encr = m:field(ListValue, "encryption", translate("Encryption")) encr:value("wpa", "WPA Enterprise") -- 2.25.1