<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
+ Copyright 2008 Steven Barth <steven@midlink.org>
+ Copyright 2008-2011 Jo-Philipp Wich <jow@openwrt.org>
+ Licensed to the public under the Apache License 2.0.
-%>
<%
- require "luci.fs"
- require "luci.tools.status"
+ local fs = require "nixio.fs"
+ local util = require "luci.util"
+ local stat = require "luci.tools.status"
+ local ver = require "luci.version"
- local has_ipv6 = luci.fs.access("/proc/net/ipv6_route")
- local has_dhcp = luci.fs.access("/etc/config/dhcp")
- local has_wifi = luci.fs.stat("/etc/config/wireless")
- has_wifi = has_wifi and has_wifi.size > 0
+ local has_ipv6 = fs.access("/proc/net/ipv6_route")
+ local has_dhcp = fs.access("/etc/config/dhcp")
+ local has_wifi = ((fs.stat("/etc/config/wireless", "size") or 0) > 0)
local sysinfo = luci.util.ubus("system", "info") or { }
local boardinfo = luci.util.ubus("system", "board") or { }
+ local unameinfo = nixio.uname() or { }
local meminfo = sysinfo.memory or {
total = 0,
free = 0
}
- local has_dsl = luci.fs.stat("/etc/init.d/dsl_control")
+ local has_dsl = fs.access("/etc/init.d/dsl_control")
if luci.http.formvalue("status") == "1" then
local ntm = require "luci.model.network".init()
local rv = {
uptime = sysinfo.uptime or 0,
- localtime = sysinfo.localtime or 0,
+ localtime = os.date(),
loadavg = sysinfo.load or { 0, 0, 0 },
memory = meminfo,
swap = swapinfo,
connmax = conn_max,
conncount = conn_count,
- leases = luci.tools.status.dhcp_leases(),
- leases6 = luci.tools.status.dhcp6_leases(),
- wifinets = luci.tools.status.wifi_networks()
+ leases = stat.dhcp_leases(),
+ leases6 = stat.dhcp6_leases(),
+ wifinets = stat.wifi_networks()
}
if wan then
for (var nidx = 0; nidx < dev.networks.length; nidx++)
{
var net = dev.networks[nidx];
- var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel);
+ var is_assoc = (net.bssid != '00:00:00:00:00:00' && net.channel && !net.disabled);
var icon;
if (!is_assoc)
var e;
if (e = document.getElementById('localtime'))
- e.innerHTML = (new Date(info.localtime * 1000)).toUTCString();
+ e.innerHTML = info.localtime;
if (e = document.getElementById('uptime'))
e.innerHTML = String.format('%t', info.uptime);
<tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr>
<tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or boardinfo.system or "?")%></td></tr>
<tr><td width="33%"><%:Firmware Version%></td><td>
- <%=pcdata(luci.version.distname)%> <%=pcdata(luci.version.distversion)%> /
- <%=pcdata(luci.version.luciname)%> (<%=pcdata(luci.version.luciversion)%>)
+ <%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%> /
+ <%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>)
</td></tr>
- <tr><td width="33%"><%:Kernel Version%></td><td><%=luci.sys.exec("uname -r")%></td></tr>
+ <tr><td width="33%"><%:Kernel Version%></td><td><%=unameinfo.release or "?"%></td></tr>
<tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
<tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr>
<tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr>
<% end %>
<%-
- require "luci.util"
- require "nixio.fs"
-
- local plugins = nixio.fs.dir(luci.util.libpath() .. "/view/admin_status/index")
- if plugins then
+ local incdir = util.libpath() .. "/view/admin_status/index/"
+ if fs.access(incdir) then
local inc
- for inc in plugins do
+ for inc in fs.dir(incdir) do
if inc:match("%.htm$") then
include("admin_status/index/" .. inc:gsub("%.htm$", ""))
end