projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modules/freifunk: fix same problem
[project/luci.git]
/
modules
/
freifunk
/
luasrc
/
model
/
cbi
/
freifunk
/
public_status.lua
diff --git
a/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
b/modules/freifunk/luasrc/model/cbi/freifunk/public_status.lua
index
27ffd95
..
2192697
100644
(file)
--- 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,
string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
tonumber(memtotal) / 1024,
100 * memcached / memtotal,
- t
ranslate("mem_cached") or ""
,
+ t
ostring(translate("mem_cached"), ""))
,
100 * membuffers / memtotal,
100 * membuffers / memtotal,
- t
ranslate("mem_buffered") or ""
,
+ t
ostring(translate("mem_buffered", ""))
,
100 * memfree / memtotal,
100 * memfree / memtotal,
- t
ranslate("mem_free") or ""
)
+ t
ostring(translate("mem_free", "")
)
f:field(DummyValue, "_systime", translate("m_i_systemtime")).value =
os.date("%c")
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
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
table.insert(ifaces, v)
end
end