luci-0.10: Merge r6979

diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
index f3538a1f111965e3babf75e411a64d34cadcb332..d9979c137b9e47f70b73e67f82a8901c177dd1ee 100644 (file)
--- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
+++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua
@@ -293,7 +293,7 @@ function public_status_json()
        end
        
        rv[#rv+1] = {
-               time = os.date("%c"),
+               time = os.date("%a, %d %b %Y %H:%M:%S UTC"),
                uptime = twa.date_format(tonumber(sys.uptime())),
                load = string.format("%.2f, %.2f, %.2f", load1, load5, load15),
                mem = mem,

diff --git a/modules/freifunk/luasrc/view/freifunk/public_status.htm b/modules/freifunk/luasrc/view/freifunk/public_status.htm
index 1698e9c23b1a9cb9fa0fd117a52fc3d7525f4d2a..fe56034e4dcb84b38148984c01ca1ad009ed891c 100644 (file)
--- a/modules/freifunk/luasrc/view/freifunk/public_status.htm
+++ b/modules/freifunk/luasrc/view/freifunk/public_status.htm
@@ -6,7 +6,7 @@ local twa = require "luci.tools.webadmin"
 -- System
 local system, model, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo()
 local uptime = twa.date_format(tonumber(sys.uptime()))
-local_time = os.date("%c")
+local_time = os.date("%a, %d %b %Y %H:%M:%S UTC")
 local load1, load5, load15 = sys.loadavg()
 local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15)