Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-travelmate: add support for optional args in auto-login script

Browse source 
This can be helpful for example in hotels where you need to
enter a new user/password combination every week.

Signed-off-by: Johannes Rothe <mail@johannes-rothe.de>
(cherry picked from commit 3d646bee41)
This commit is contained in:
Johannes Rothe 2019-09-19 23:28:39 +02:00 committed by Dirk Brenken
parent 08db1df41c
commit 7a7a56adb6
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_add.lua
View file

@ -140,13 +140,18 @@ end
local login_section = (m.hidden.ssid or "") .. (m.hidden.bssid or "") local login_section = (m.hidden.ssid or "") .. (m.hidden.bssid or "")
login_section = login_section:gsub("[^%w_]", "_") login_section = login_section:gsub("[^%w_]", "_")
local cmd = uci:get("travelmate", login_section, "command") local cmd = uci:get("travelmate", login_section, "command")
local cmd_args_default = uci:get("travelmate", login_section, "command_args")
cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"), cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
translate("External script reference which will be called for automated captive portal logins.")) translate("External script reference which will be called for automated captive portal logins."))
cmd_list:value("none") cmd_args = m:field(Value, "cmdargs", translate("Optional Arguments"),
translate("Space separated list of additional optional arguments passed to the Auto Login Script, i.e. username and password"))
for _, z in ipairs(scripts) do for _, z in ipairs(scripts) do
cmd_list:value(z) cmd_list:value(z)
cmd_args:depends("cmdlist", z)
end end
cmd_list:value("none")
cmd_list.default = cmd or "none" cmd_list.default = cmd or "none"
cmd_args.default = cmd_args_default
function wssid.write(self, section, value) function wssid.write(self, section, value)
newsection = uci:section("wireless", "wifi-iface", nil, { newsection = uci:section("wireless", "wifi-iface", nil, {
@ -194,6 +199,7 @@ function wssid.write(self, section, value)
end end
if uci:get("travelmate", login_section) then if uci:get("travelmate", login_section) then
uci:set("travelmate", login_section, "command", cmd_list:formvalue(section)) uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
uci:set("travelmate", login_section, "command_args", cmd_args:formvalue(section))
uci:save("travelmate") uci:save("travelmate")
uci:commit("travelmate") uci:commit("travelmate")
end end

8
applications/luci-app-travelmate/luasrc/model/cbi/travelmate/wifi_edit.lua
View file

@ -133,13 +133,18 @@ if s ~= nil then
local login_section = (s.ssid or "") .. (s.bssid or "") local login_section = (s.ssid or "") .. (s.bssid or "")
login_section = login_section:gsub("[^%w_]", "_") login_section = login_section:gsub("[^%w_]", "_")
local cmd = uci:get("travelmate", login_section, "command") local cmd = uci:get("travelmate", login_section, "command")
local cmd_args_default = uci:get("travelmate", login_section, "command_args")
cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"), cmd_list = m:field(ListValue, "cmdlist", translate("Auto Login Script"),
translate("External script reference which will be called for automated captive portal logins.")) translate("External script reference which will be called for automated captive portal logins."))
cmd_list:value("none") cmd_args = m:field(Value, "cmdargs", translate("Optional Arguments"),
translate("Space separated list of additional optional arguments passed to the Auto Login Script, i.e. username and password"))
for _, z in ipairs(scripts) do for _, z in ipairs(scripts) do
cmd_list:value(z) cmd_list:value(z)
cmd_args:depends("cmdlist", z)
end end
cmd_list:value("none")
cmd_list.default = cmd or "none" cmd_list.default = cmd or "none"
cmd_args.default = cmd_args_default
else else
m.on_cancel() m.on_cancel()
end end
@ -181,6 +186,7 @@ function wssid.write(self, section, value)
end end
if uci:get("travelmate", login_section) then if uci:get("travelmate", login_section) then
uci:set("travelmate", login_section, "command", cmd_list:formvalue(section)) uci:set("travelmate", login_section, "command", cmd_list:formvalue(section))
uci:set("travelmate", login_section, "command_args", cmd_args:formvalue(section))
uci:save("travelmate") uci:save("travelmate")
uci:commit("travelmate") uci:commit("travelmate")
end end