X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Ffreifunk%2Fluasrc%2Fview%2Ffreifunk%2Fadminindex.htm;h=e0252ba8919cfc5ca234d9d9eaa7a6aa8f25c39e;hb=839dcdc01299869bc714990c19d8e244f18318b5;hp=4eed2aa954a6940827ad7c279167b02465dc2787;hpb=1a511de0be0ebd21bd076c9d84074a7e3958b489;p=project%2Fluci.git

diff --git a/modules/freifunk/luasrc/view/freifunk/adminindex.htm b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
index 4eed2aa95..e0252ba89 100644
--- a/modules/freifunk/luasrc/view/freifunk/adminindex.htm
+++ b/modules/freifunk/luasrc/view/freifunk/adminindex.htm
@@ -8,7 +8,15 @@ local latitude = uci:get_first ("system", "system", "latitude")
 local longitude = uci:get_first ("system", "system", "longitude")
 local location = uci:get_first ("system", "system", "location")
 local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics")
-luci.i18n.loadc("freifunk")
+local nickname, name, mail
+if not contact then
+	nickname, name, mail = ""
+else
+	nickname = contact.nickname
+	name = contact.name
+	mail = contact.mail
+end
+
 %>
 
 <h2><%:Freifunk Overview%></h2>
@@ -23,7 +31,7 @@ luci.i18n.loadc("freifunk")
 <%end%>
 <p />
 
-<% if not (contact.nickname and contact.name and contact.mail) then%>
+<% if not (nickname and name and mail) then%>
 <div class="error">
 	<%:Contact information is incomplete. Please go to%> <a href='<%=contacturl%>'><%:Contact%></a> <%:and fill out all required fields.%>
 	<p />
@@ -33,8 +41,8 @@ luci.i18n.loadc("freifunk")
 <% uci:foreach("wireless", "wifi-device", function(section)
 	local device = section[".name"]
 	local url = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "network", "wireless")
-	if section.diversity ~= "0" and section.disabled ~= "1" then
-		print('<div class="error">' .. translate("Diversity is enabled for device") .. ' <b>' .. device .. '</b>. '
+	if section.diversity ~= "0" and section.disabled ~= "1" and section.type ~= "mac80211" then
+		print('<div class="error">' .. translate("Diversity is enabled for device") .. ' <b>' .. section[".name"] .. '</b>. '
 		.. translate("Go to") .. ' <a href="' .. url .. '">' .. translate("wireless settings") .. '</a> ' ..
 		translate("to disable it.") .. '</div><p />')
 	end