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

Merge pull request #2421 from SibrenVasse/ssid_format

Browse source 
SSID escaping
This commit is contained in:
Jo-Philipp Wich 2019-01-30 08:23:53 +01:00 committed by GitHub
commit 1828af9827
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
View file

@ -81,7 +81,7 @@ L.poll(5, L.url('admin/network/iface_status', networks.join(',')), null,
desc = desc ? '%s (%s)'.format(desc, ifc.desc) : ifc.desc; desc = desc ? '%s (%s)'.format(desc, ifc.desc) : ifc.desc;
L.itemlist(d, [ L.itemlist(d, [
_('Protocol'), '%h'.format(desc || '?'), _('Protocol'), desc || '?',
_('Uptime'), ifc.is_up ? '%t'.format(ifc.uptime) : null, _('Uptime'), ifc.is_up ? '%t'.format(ifc.uptime) : null,
_('MAC'), (!ifc.is_dynamic && !ifc.is_alias && ifc.macaddr) ? ifc.macaddr : null, _('MAC'), (!ifc.is_dynamic && !ifc.is_alias && ifc.macaddr) ? ifc.macaddr : null,
_('RX'), (!ifc.is_dynamic && !ifc.is_alias) ? '%.2mB (%d %s)'.format(ifc.rx_bytes, ifc.rx_packets, _('Pkts.')) : null, _('RX'), (!ifc.is_dynamic && !ifc.is_alias) ? '%.2mB (%d %s)'.format(ifc.rx_bytes, ifc.rx_packets, _('Pkts.')) : null,

2
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js
View file

@ -39,7 +39,7 @@ requestAnimationFrame(function() {
L.itemlist(info, [ L.itemlist(info, [
_('Mode'), iw.mode, _('Mode'), iw.mode,
_('SSID'), '%h'.format(iw.ssid || '?'), _('SSID'), iw.ssid || '?',
_('BSSID'), is_assoc ? iw.bssid : null, _('BSSID'), is_assoc ? iw.bssid : null,
_('Encryption'), is_assoc ? iw.encryption || _('None') : null, _('Encryption'), is_assoc ? iw.encryption || _('None') : null,
_('Channel'), is_assoc ? '%d (%.3f %s)'.format(iw.channel, iw.frequency || 0, _('GHz')) : null, _('Channel'), is_assoc ? '%d (%.3f %s)'.format(iw.channel, iw.frequency || 0, _('GHz')) : null,

2
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View file

@ -70,7 +70,7 @@ L.poll(5, L.url('admin/network/wireless_status', networks.join(',')), null,
}, [ E('img', { src: icon }), ' %d%%'.format(p) ])); }, [ E('img', { src: icon }), ' %d%%'.format(p) ]));
L.itemlist(info, [ L.itemlist(info, [
_('SSID'), '%h'.format(iw.ssid || '?'), _('SSID'), iw.ssid || '?',
_('Mode'), iw.mode, _('Mode'), iw.mode,
_('BSSID'), iw.is_assoc ? iw.bssid : null, _('BSSID'), iw.is_assoc ? iw.bssid : null,
_('Encryption'), iw.is_assoc ? iw.encryption || _('None') : null, _('Encryption'), iw.is_assoc ? iw.encryption || _('None') : null,