X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-app-travelmate%2Fluasrc%2Fview%2Ftravelmate%2Fwifi_scan.htm;h=af90c18d23a2be32f21efb73d09b1aa26b512488;hp=e1818a06fd8cefd3b0dc2ebce173454dc272144f;hb=3317104647c6e189094464d045d9ec76ee8530e9;hpb=52a0787c3fd6ad066e98f3d81849c413d8ea3bd4

diff --git a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
index e1818a06f..af90c18d2 100644
--- a/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
+++ b/applications/luci-app-travelmate/luasrc/view/travelmate/wifi_scan.htm
@@ -4,8 +4,8 @@ This is free software, licensed under the Apache License, Version 2.0
 -%>
 
 <%-
-    local sys = require "luci.sys"
-    local utl = require "luci.util"
+    local sys = require("luci.sys")
+    local utl = require("luci.util")
     local dev = luci.http.formvalue("device")
     local iw = luci.sys.wifi.getiwinfo(dev)
 
@@ -28,35 +28,18 @@ This is free software, licensed under the Apache License, Version 2.0
     function percent_wifi_signal(info)
         local qc = info.quality or 0
         local qm = info.quality_max or 0
-        if info.bssid and qc > 0 and qm > 0 then
+        if info.ssid and qc > 0 and qm > 0 then
             return math.floor((100 / qm) * qc)
         else
             return 0
         end
     end
-
-    function scanlist(times)
-        local i, k, v
-        local l = { }
-        local s = { }
-
-        for i = 1, times do
-            for k, v in ipairs(iw.scanlist or { }) do
-                if not s[v.bssid] then
-                    l[#l+1] = v
-                    s[v.bssid] = true
-                end
-            end
-        end
-        return l
-    end
 -%>
 
 <%+header%>
 
 <div class="cbi-map">
 <h2 name="content"><%:Wireless Scan%></h2>
-
     <fieldset class="cbi-section">
         <table class="cbi-section-table" style="empty-cells:hide">
             <tr class="cbi-section-table-titles">
@@ -64,8 +47,8 @@ This is free software, licensed under the Apache License, Version 2.0
                 <th class="cbi-section-table-cell" style="text-align:left"><%:Encryption%></th>
                 <th class="cbi-section-table-cell" style="text-align:left" colspan="2"><%:Signal strength%></th>
             </tr>
-            <% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %>
-            <tr class="cbi-section-table-row cbi-rowstyle-4">
+            <% for i, net in ipairs(iw.scanlist or { }) do %>
+            <tr class="cbi-section-table-row cbi-rowstyle-1">
                 <td class="cbi-value-field" style="text-align:left">
                     <strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong>
                 </td>
@@ -75,19 +58,17 @@ This is free software, licensed under the Apache License, Version 2.0
                 <td class="cbi-value-field" style="text-align:left">
                     <%=percent_wifi_signal(net)%> %
                 </td>
-                <td class="cbi-value-field" style="width:120px; text-align:right">
+                <td class="cbi-value-field" style="width:100px;text-align:right">
                     <form class="inline" action="<%=url('admin/services/travelmate/wifiadd')%>" method="post">
-                        <input type="hidden" name="token" value="<%=token%>" />
-                        <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-                        <input type="hidden" name="ssid" value="<%=utl.pcdata(net.ssid)%>" />
-                        <input type="hidden" name="wep" value="<%=net.encryption.wep and 1 or 0%>" />
+                        <input type="hidden" name="token" value="<%=token%>"/>
+                        <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
+                        <input type="hidden" name="ssid" value="<%=utl.pcdata(net.ssid)%>"/>
+                        <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%>" />
+                        <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; end %>
-                        <input class="cbi-button cbi-button-apply" style="width:110px" type="submit" value="<%:Add Uplink%>" />
+                        <input class="cbi-button cbi-button-apply" type="submit" value="<%:Add Uplink%>"/>
                     </form>
                 </td>
             </tr>
@@ -95,14 +76,15 @@ This is free software, licensed under the Apache License, Version 2.0
         </table>
     </fieldset>
 <div class="cbi-page-actions right">
-    <form class="inline" action="<%=url('admin/services/travelmate/stations')%>" method="post">
-        <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" />
-    </form>
     <form class="inline" action="<%=url('admin/services/travelmate/wifiscan')%>" method="post">
-        <input type="hidden" name="token" value="<%=token%>" />
-        <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-        <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>" />
+        <input type="hidden" name="token" value="<%=token%>"/>
+        <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>"/>
+        <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>"/>
     </form>
+    <form class="inline" action="<%=url('admin/services/travelmate/stations')%>" method="post">
+        <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>"/>
+    </form>
+</div>
 </div>
 
 <%+footer%>