X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Ffreifunk%2Fluasrc%2Fmodel%2Fcbi%2Ffreifunk%2Fpublic_status.lua;h=2192697fdec8cb042b952ab6174bc67c24bdb0d3;hp=27ffd959fd5de2cb9803d5b4a5d34bfb2f6b4d15;hb=debfd75f3384cac10939c62c2f884ae3c1a8cb4e;hpb=75e9772baae4d04803f191cbd832c204c9538d5b diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua index 27ffd959f..2192697fd 100644 --- a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua +++ b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua @@ -27,11 +27,11 @@ f:field(DummyValue, "_memtotal", translate("m_i_memory")).value = string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)", tonumber(memtotal) / 1024, 100 * memcached / memtotal, - translate("mem_cached") or "", + tostring(translate("mem_cached"), "")), 100 * membuffers / memtotal, - translate("mem_buffered") or "", + tostring(translate("mem_buffered", "")), 100 * memfree / memtotal, - translate("mem_free") or "") + tostring(translate("mem_free", "")) f:field(DummyValue, "_systime", translate("m_i_systemtime")).value = os.date("%c") @@ -47,7 +47,10 @@ local wifidata = luci.sys.wifi.getiwconfig() local ifaces = {} for k, v in pairs(wireless) do - if v[".type"] == "wifi-iface" and luci.util.contains(ffwifs, v.device) then + if v[".type"] == "wifi-iface" and ( + luci.util.contains(ffwifs, v.device) or + ( #ffwifs == 0 and (not v.encryption or v.encryption == "none") ) ) + then table.insert(ifaces, v) end end