Merge 0.9->0.10

[prosody.git] / util / datetime.lua

diff --git a/util/datetime.lua b/util/datetime.lua
index e853ff785d49c81c14a31caeb00176b5198b4c63..27f28ace7eff560c5b3c7efc1caa0bbc880809e8 100644 (file)
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -15,42 +15,49 @@ local os_difftime = os.difftime;
 local error = error;
 local tonumber = tonumber;
 
-module "datetime"
+local _ENV = nil;
 
-function date(t)
+local function date(t)
        return os_date("!%Y-%m-%d", t);
 end
 
-function datetime(t)
+local function datetime(t)
        return os_date("!%Y-%m-%dT%H:%M:%SZ", t);
 end
 
-function time(t)
+local function time(t)
        return os_date("!%H:%M:%S", t);
 end
 
-function legacy(t)
+local function legacy(t)
        return os_date("!%Y%m%dT%H:%M:%S", t);
 end
 
-function parse(s)
+local function parse(s)
        if s then
                local year, month, day, hour, min, sec, tzd;
-               year, month, day, hour, min, sec, tzd = s:match("^(%d%d%d%d)-?(%d%d)-?(%d%d)T(%d%d):(%d%d):(%d%d)%.?%d*([Z+%-].*)$");
+               year, month, day, hour, min, sec, tzd = s:match("^(%d%d%d%d)%-?(%d%d)%-?(%d%d)T(%d%d):(%d%d):(%d%d)%.?%d*([Z+%-]?.*)$");
                if year then
                        local time_offset = os_difftime(os_time(os_date("*t")), os_time(os_date("!*t"))); -- to deal with local timezone
                        local tzd_offset = 0;
                        if tzd ~= "" and tzd ~= "Z" then
-                               local sign, h, m = tzd:match("([+%-])(%d%d):(%d%d)");
+                               local sign, h, m = tzd:match("([+%-])(%d%d):?(%d*)");
                                if not sign then return; end
+                               if #m ~= 2 then m = "0"; end
                                h, m = tonumber(h), tonumber(m);
                                tzd_offset = h * 60 * 60 + m * 60;
                                if sign == "-" then tzd_offset = -tzd_offset; end
                        end
-                       sec = sec + time_offset + tzd_offset;
-                       return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec});
+                       sec = (sec + time_offset) - tzd_offset;
+                       return os_time({year=year, month=month, day=day, hour=hour, min=min, sec=sec, isdst=false});
                end
        end
 end
 
-return _M;
+return {
+       date     = date;
+       datetime = datetime;
+       time     = time;
+       legacy   = legacy;
+       parse    = parse;
+};