$Id$
]]--
-require("luci.http.protocol.date")
+
require("luci.sys")
+require("luci.sys.zoneinfo")
require("luci.tools.webadmin")
+require("luci.fs")
+
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
+
+function m.on_parse()
+ local has_rdate = false
+
+ m.uci:foreach("system", "rdate",
+ function()
+ has_rdate = true
+ return false
+ end)
+end
-m = Map("system", translate("system"), translate("a_s_desc"))
s = m:section(TypedSection, "system", "")
s.anonymous = true
+s.addremove = false
local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
local uptime = luci.sys.uptime()
-s:option(DummyValue, "_system", translate("system")).value = system
-s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model
+s:option(DummyValue, "_system", translate("System")).value = system
+s:option(DummyValue, "_cpu", translate("Processor")).value = model
local load1, load5, load15 = luci.sys.loadavg()
-s:option(DummyValue, "_la", translate("load")).value =
+s:option(DummyValue, "_la", translate("Load")).value =
string.format("%.2f, %.2f, %.2f", load1, load5, load15)
-
-s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
+
+s:option(DummyValue, "_memtotal", translate("Memory")).value =
string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
tonumber(memtotal) / 1024,
100 * memcached / memtotal,
- translate("mem_cached") or "",
+ tostring(translate("cached")),
100 * membuffers / memtotal,
- translate("mem_buffered") or "",
+ tostring(translate("buffered")),
100 * memfree / memtotal,
- translate("mem_free") or "")
+ tostring(translate("free"))
+)
-s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
+s:option(DummyValue, "_systime", translate("Local Time")).value =
os.date("%c")
-
-s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
+
+s:option(DummyValue, "_uptime", translate("Uptime")).value =
luci.tools.webadmin.date_format(tonumber(uptime))
-s:option(Value, "hostname", translate("hostname"))
-
-tz = s:option(Value, "timezone", translate("timezone"))
-for k, offset in luci.util.vspairs(luci.http.protocol.date.TZ) do
- local zone = k:upper()
- local osgn = (offset >= 0 and "" or "+")
- local ohrs = math.floor(-offset / 3600)
- local omin = (offset % 3600) / 60
-
- local ptz = zone .. osgn .. (ohrs ~= 0 and ohrs or "") .. (omin ~= 0 and ":" .. omin or "")
- local dtz = string.format("%+03d:%02d ", ohrs, omin) .. zone
-
- tz:value(ptz, dtz)
+hn = s:option(Value, "hostname", translate("Hostname"))
+
+function hn.write(self, section, value)
+ Value.write(self, section, value)
+ luci.sys.hostname(value)
+end
+
+
+tz = s:option(ListValue, "zonename", translate("Timezone"))
+tz:value("UTC")
+
+for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
+ tz:value(zone[1])
+end
+
+function tz.write(self, section, value)
+ local function lookup_zone(title)
+ for _, zone in ipairs(luci.sys.zoneinfo.TZ) do
+ if zone[1] == title then return zone[2] end
+ end
+ end
+
+ AbstractValue.write(self, section, value)
+ local timezone = lookup_zone(value) or "GMT0"
+ self.map.uci:set("system", section, "timezone", timezone)
+ luci.fs.writefile("/etc/TZ", timezone .. "\n")
+end
+
+s:option(Value, "log_size", translate("System log buffer size"), "kiB").optional = true
+s:option(Value, "log_ip", translate("External system log server")).optional = true
+s:option(Value, "log_port", translate("External system log server port")).optional = true
+s:option(Value, "conloglevel", translate("Log output level")).optional = true
+s:option(Value, "cronloglevel", translate("Cron Log Level")).optional = true
+
+if has_rdate then
+ s2 = m:section(TypedSection, "rdate", translate("Time Server (rdate)"))
+ s2.anonymous = true
+ s2.addremove = false
+
+ s2:option(DynamicList, "server", translate("Server"))
end
-s:option(Value, "log_size", nil, "kiB").optional = true
-s:option(Value, "log_ip").optional = true
-s:option(Value, "conloglevel").optional = true
return m