diff options
5 files changed, 14 insertions, 17 deletions
diff --git a/modules/admin-full/luasrc/view/admin_network/iface_status.htm b/modules/admin-full/luasrc/view/admin_network/iface_status.htm index c2790db2c..5836d4145 100644 --- a/modules/admin-full/luasrc/view/admin_network/iface_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/iface_status.htm @@ -4,9 +4,8 @@ var iwxhr = new XHR(); (function() { iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "iface_status", self.network)%>', null, - function(x) + function(x, ifc) { - var ifc = x.responseText ? eval('(' + x.responseText + ')') : { }; if (ifc && (ifc = ifc[0])) { var is_up = (ifc.flags && ifc.flags.up); diff --git a/modules/admin-full/luasrc/view/admin_network/lease_status.htm b/modules/admin-full/luasrc/view/admin_network/lease_status.htm index 3710eb0ed..6f90640cb 100644 --- a/modules/admin-full/luasrc/view/admin_network/lease_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/lease_status.htm @@ -2,11 +2,9 @@ var stxhr = new XHR(); (function() { stxhr.get('<%=luci.dispatcher.build_url("admin", "network", "dhcplease_status")%>', null, - function(x) + function(x, st) { - var st = x.responseText ? eval('(' + x.responseText + ')') : null; var tb = document.getElementById('lease_status_table'); - if (st && tb) { /* clear all rows */ diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm index 6ed4627dc..af5f5e107 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm @@ -77,7 +77,7 @@ $Id$ <fieldset class="cbi-section"> <table class="cbi-section-table" style="empty-cells:hide"> <!-- scan list --> - <% for i, net in ipairs(iw.scanlist) do %> + <% for i, net in ipairs(iw.scanlist) do net.encryption = net.encryption or { } %> <tr class="cbi-section-table-row cbi-rowstyle-<%=1 + ((i-1) % 2)%>"> <td class="cbi-value-field" style="width:16px; padding:3px"> <abbr title="Signal: <%=net.signal%> dB / Quality: <%=net.quality%>/<%=net.quality_max%>"> @@ -90,7 +90,7 @@ $Id$ <strong>Channel:</strong> <%=net.channel%> | <strong>Mode:</strong> <%=net.mode%> | <strong>BSSID:</strong> <%=net.bssid%> | - <strong>Encryption:</strong> <%=format_wifi_encryption(net)%> + <strong>Encryption:</strong> <%=net.encryption.description or translate("Open")%> </td> <td class="cbi-value-field" style="width:40px"> <form action="<%=REQUEST_URI%>" method="post"> @@ -99,14 +99,16 @@ $Id$ <input type="hidden" name="mode" value="<%=net.mode%>" /> <input type="hidden" name="bssid" value="<%=net.bssid%>" /> <input type="hidden" name="channel" value="<%=net.channel%>" /> - <input type="hidden" name="wep" value="<%=net.wep and 1 or 0%>" /> - <% if net.wpa then %> - <input type="hidden" name="wpa_version" value="<%=net.wpa%>" /> - <% for _, v in ipairs(net.auth_suites) do %><input type="hidden" name="wpa_suites" value="<%=v%>" /> - <% end; for _, v in ipairs(net.group_ciphers) do %><input type="hidden" name="wpa_group" value="<%=v%>" /> - <% end; for _, v in ipairs(net.pair_ciphers) do %><input type="hidden" name="wpa_pairwise" value="<%=v%>" /> + <input type="hidden" name="wep" value="<%=net.encryption.wep and 1 or 0%>" /> + <% if net.encryption.wpa then %> + <input type="hidden" name="wpa_version" value="<%=net.encryption.wpa%>" /> + <% for _, v in ipairs(net.encryption.auth_suites) do %><input type="hidden" name="wpa_suites" value="<%=v%>" /> + <% end; for _, v in ipairs(net.encryption.group_ciphers) do %><input type="hidden" name="wpa_group" value="<%=v%>" /> + <% end; for _, v in ipairs(net.encryption.pair_ciphers) do %><input type="hidden" name="wpa_pairwise" value="<%=v%>" /> <% end; end %> + <input type="hidden" name="clbridge" value="<%=iw.type == "wl" and 1 or 0%>" /> + <input class="cbi-button-apply" type="submit" value="Join Network" /> </form> </td> diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm index 3de12d229..0702017de 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm @@ -99,9 +99,8 @@ $Id$ (function() { iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", table.concat(netlist, ","))%>', null, - function(x) + function(x, st) { - var st = x.responseText ? eval('(' + x.responseText + ')') : null; if (st) { var assoctable = document.getElementById('iw-assoclist'); diff --git a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm index 4b49caefb..e81ff06bd 100644 --- a/modules/admin-full/luasrc/view/admin_network/wifi_status.htm +++ b/modules/admin-full/luasrc/view/admin_network/wifi_status.htm @@ -4,9 +4,8 @@ var iwxhr = new XHR(); (function() { iwxhr.get('<%=luci.dispatcher.build_url("admin", "network", "wireless_status", self.ifname)%>', null, - function(x) + function(x, iw) { - var iw = x.responseText ? eval('(' + x.responseText + ')') : null; if (iw && (iw = iw[0])) { var is_assoc = (iw.bssid && iw.channel); |