modules/admin-full, modules/admin-mini: prevent addremove in system page

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_system / system.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index e0e2b1c..c37e726 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -11,14 +11,16 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-require("luci.http.protocol.date")
+
 require("luci.sys")
+require("luci.sys.zoneinfo")
 require("luci.tools.webadmin")
 
 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()
@@ -27,41 +29,54 @@ s:option(DummyValue, "_system", translate("system")).value = system
 s:option(DummyValue, "_cpu", translate("m_i_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("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", ""))
+)
 
 s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
  os.date("%c")
- 
-s:option(DummyValue, "_uptime", translate("m_i_uptime")).value = 
+
+s:option(DummyValue, "_uptime", translate("m_i_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)
+       self.map.uci:set("system", section, "timezone", lookup_zone(value) or "GMT0")
 end
 
 s:option(Value, "log_size", nil, "kiB").optional = true
 s:option(Value, "log_ip").optional = true
 s:option(Value, "conloglevel").optional = true
+s:option(Value, "cronloglevel").optional = true
 return m