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

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
index e8a305882656226d54129aebe7d1b5ef57952d40..1201773aca82a9b122784f6180394e6d904b68d1 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua
@@ -6,6 +6,7 @@ local nw   = require "luci.model.network"
 local fw   = require "luci.model.firewall"
 local uci  = require "luci.model.uci".cursor()
 local http = require "luci.http"
+local util = require "luci.util"
 
 local iw = luci.sys.wifi.getiwinfo(http.formvalue("device"))
 
@@ -16,7 +17,7 @@ if not iw then
        return
 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.reset = false
 

diff --git a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm
index 7427154a047a909260f6c8ea093a6da3274ab979..eab85838d15dd6cf9e341421f23f2207bb9ba9e5 100644 (file)
--- a/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm
+++ b/modules/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm
@@ -83,7 +83,7 @@
                                                }
 
                                                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');