X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fwifi_join.htm;h=f3b6dddefc9181b8b212862a312fb2add5ab086c;hb=45312520ab348ec58d0808b0c335c996e0df3a9d;hp=b6204c0dc0cf9ffe5e6b8c5b3f6cc362dc35c3ff;hpb=7d959a602420ad4a98b570fc312c58d945ddde1f;p=project%2Fluci.git

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 b6204c0dc..f3b6dddef 100644
--- a/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
+++ b/modules/admin-full/luasrc/view/admin_network/wifi_join.htm
@@ -50,18 +50,20 @@ $Id$
 	end
 
 	function format_wifi_encryption(info)
-		if info.wep == true and not info.wpa_version then
+		if info.wep == true then
 			return "WEP"
-		elseif info.wpa then
-			return "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>" % {
+		elseif info.wpa > 0 then
+			return translatef("<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>",
 				table.concat(info.pair_ciphers, ", "),
 				table.concat(info.group_ciphers, ", "),
-				(info.wpa == 3) and "mixed WPA/WPA2"
+				(info.wpa == 3) and translate("mixed WPA/WPA2")
 					or (info.wpa == 2 and "WPA2" or "WPA"),
 				table.concat(info.auth_suites, ", ")
-			}
+			)
+		elseif info.enabled then
+			return "<em>%s</em>" % translate("unknown")
 		else
-			return "<em>None</em>"
+			return "<em>%s</em>" % translate("open")
 		end
 	end
 
@@ -72,6 +74,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 or { }) do
+				if not s[v.bssid] then
+					l[#l+1] = v
+					s[v.bssid] = true
+				end
+			end
+		end
+
+		return l
+	end
 -%>
 
 <%+header%>
@@ -82,20 +102,20 @@ $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%>">
+					<abbr title="<%:Signal%>: <%=net.signal%> <%:dB%> / <%:Quality%>: <%=net.quality%>/<%=net.quality_max%>">
 						<img src="<%=guess_wifi_signal(net)%>" /><br />
 						<small><%=percent_wifi_signal(net)%>%</small>
 					</abbr>
 				</td>
 				<td class="cbi-value-field" style="vertical-align:middle; text-align:left; padding:3px">
-					<big><strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>hidden</em>"%></strong></big><br />
+					<big><strong><%=net.ssid and utl.pcdata(net.ssid) or "<em>%s</em>" % translate("hidden")%></strong></big><br />
 					<strong>Channel:</strong> <%=net.channel%> |
 					<strong>Mode:</strong> <%=net.mode%> |
 					<strong>BSSID:</strong> <%=net.bssid%> |
-					<strong>Encryption:</strong> <%=net.encryption.description or translate("Open")%>
+					<strong>Encryption:</strong> <%=format_wifi_encryption(net.encryption)%>
 				</td>
 				<td class="cbi-value-field" style="width:40px">
 					<form action="<%=REQUEST_URI%>" method="post">