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

luci-app-travelmate: sync with travelmate 1.5.4

Browse source 
* change wifi scanning to logical interface name,
  no longer use the radio device

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2020-04-22 21:40:04 +02:00
parent dc1d2ce7ab
commit 9d02ef1bd9
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
View file

@ -1,5 +1,5 @@
<%# <%#
Copyright 2017-2019 Dirk Brenken (dev@brenken.org) Copyright 2017-2020 Dirk Brenken (dev@brenken.org)
This is free software, licensed under the Apache License, Version 2.0 This is free software, licensed under the Apache License, Version 2.0
-%> -%>
@ -7,7 +7,14 @@ This is free software, licensed under the Apache License, Version 2.0
local sys = require("luci.sys") local sys = require("luci.sys")
local utl = require("luci.util") local utl = require("luci.util")
local dev = luci.http.formvalue("device") local dev = luci.http.formvalue("device")
local iw = luci.sys.wifi.getiwinfo(dev) local ifn = utl.trim(sys.exec("/bin/ubus -S call network.wireless status 2>/dev/null | jsonfilter -l1 -e \"@." .. dev .. ".interfaces.*.ifname\" 2>/dev/null"))
local iw
if ifn ~= "" then
iw = sys.wifi.getiwinfo(ifn)
else
iw = sys.wifi.getiwinfo(dev)
end
if not iw then if not iw then
luci.http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations")) luci.http.redirect(luci.dispatcher.build_url("admin/services/travelmate/stations"))