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

luci-mod-admin-full: proper SSID escaping in wifi join and iface overview

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-11-05 14:32:09 +01:00
parent a32190c0b2
commit bc17ef673f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
View file

@ -6,6 +6,7 @@ local nw = require "luci.model.network"
local fw = require "luci.model.firewall" local fw = require "luci.model.firewall"
local uci = require "luci.model.uci".cursor() local uci = require "luci.model.uci".cursor()
local http = require "luci.http" local http = require "luci.http"
local util = require "luci.util"
local iw = luci.sys.wifi.getiwinfo(http.formvalue("device")) local iw = luci.sys.wifi.getiwinfo(http.formvalue("device"))
@ -16,7 +17,7 @@ if not iw then
return return
end end
m = SimpleForm("network", translatef("Joining Network: %q", http.formvalue("join"))) m = SimpleForm("network", translatef("Joining Network: %q", util.pcdata(http.formvalue("join"))))
m.cancel = translate("Back to scan results") m.cancel = translate("Back to scan results")
m.reset = false m.reset = false

2
modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm
View file

@ -83,7 +83,7 @@
} }
s.appendChild(E('br')); s.appendChild(E('br'));
s.appendChild(E('small', {}, ifc.is_alias ? '<%:Alias of "%s"%>'.format(ifc.is_alias) : ifc.name)); s.appendChild(E('small', {}, [ ifc.is_alias ? '<%:Alias of "%s"%>'.format(ifc.is_alias) : ifc.name ]));
} }
var d = document.getElementById(ifc.id + '-ifc-description'); var d = document.getElementById(ifc.id + '-ifc-description');