Changeset 5353

Timestamp:

09/27/09 04:04:36 (4 years ago)

Author:

jow

Message:

modules/admin-full: fix some problems with b43

Files:

• luci/trunk/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm (modified) (4 diffs)

luci/trunk/modules/admin-full/luasrc/view/admin_network/wifi_overview.htm

@@ -66 +66 @@
         -- dunno yet
         else
-            return "Unkown 802.11 Wireless Controller"
+            return "Generic 802.11 Wireless Controller"
         end
     end
@@ -161 +161 @@
                 <td colspan="2" style="text-align:left">
                     <big><strong><%=state.hwname%> (<%=dev%>)</strong></big><br />
-                    <strong>Channel:</strong> <%=find_wifi_frequency(state)%> |
-                    <strong>Bitrate:</strong> <%=(state and state.networks[1]) and (state.networks[1].info.bitrate / 1000) .. " Mb/s" or "n/a"%>
+                    <% if state.networks[1] and state.networks[1].info then %>
+                        <strong>Channel:</strong> <%=find_wifi_frequency(state)%> |
+                        <strong>Bitrate:</strong> <%=state.networks[1].info.bitrate and (state.networks[1].info.bitrate / 1000) .. " Mb/s" or "n/a"%>
+                    <% end %>
                 </td>
                 <td style="width:40px">
@@ -177 +179 @@
                     <td></td>
                     <td class="cbi-value-field" style="width:16px; padding:3px">
-                        <img src="<%=guess_wifi_signal(net.info)%>" title="Signal: <%=net.info.signal%> dBm / Noise: <%=net.info.noise%> dBm" /><br />
+                        <img src="<%=guess_wifi_signal(net.info)%>" title="Signal: <%=net.info.signal or 0%> dBm / Noise: <%=net.info.noise or 0%> dBm" /><br />
                         <small><%=percent_wifi_signal(net.info)%>%</small>
                     </td>
@@ -184 +186 @@
                         <strong>Mode:</strong> <%=net.info.mode%><br />
                         <strong>BSSID:</strong> <%=net.info.bssid%> |
-                        <strong>Encryption:</strong> <%=net.info.enctype%>
+                        <strong>Encryption:</strong> <%=net.info.enctype or "None"%>
                     </td>
                     <td class="cbi-value-field" style="width:40px">