modules/admin-full: scan three times to catch more networks in wifi join setup

[project/luci.git] / modules / admin-full / luasrc / view / admin_network / wifi_join.htm

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 4dea9ba..03407b8 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -72,6 +72,24 @@ $Id$
                luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless"))
                return
        end
+
+
+       function scanlist(times)
+               local i, k, v
+               local l = { }
+               local s = { }
+
+               for i = 1, times do
+                       for k, v in ipairs(iw.scanlist) do
+                               if not s[v.bssid] then
+                                       l[#l+1] = v
+                                       s[v.bssid] = true
+                               end
+                       end
+               end
+
+               return l
+       end
 -%>
 
 <%+header%>
@@ -82,7 +100,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 net.encryption = net.encryption or { } %>
+                       <% for i, net in ipairs(scanlist(3)) 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%>">
@@ -114,7 +132,7 @@ $Id$
 
                                                <input type="hidden" name="clbridge" value="<%=iw.type == "wl" and 1 or 0%>" />
 
-                                               <input class="cbi-button-apply" type="submit" value="<%:Join Network%>" />
+                                               <input class="cbi-button cbi-button-apply" type="submit" value="<%:Join Network%>" />
                                        </form>
                                </td>
                        </tr>
@@ -125,11 +143,11 @@ $Id$
 </div>
 <div class="cbi-page-actions right">
        <form class="inline" action="<%=luci.dispatcher.build_url("admin/network/wireless")%>" method="get">
-               <input class="cbi-button-reset" type="submit" value="<%:Back to overview%>" />
+               <input class="cbi-button cbi-button-reset" type="submit" value="<%:Back to overview%>" />
        </form>
        <form class="inline" action="<%=REQUEST_URI%>" method="get">
                <input type="hidden" name="device" value="<%=utl.pcdata(dev)%>" />
-               <input class="cbi-input-find" type="submit" value="<%:Repeat scan%>" />
+               <input class="cbi-button cbi-input-find" type="submit" value="<%:Repeat scan%>" />
        </form>
 </div>