mod_adhoc: Add support for commands only executable by global administrators

[prosody.git] / util / datetime.lua

diff --git a/util/datetime.lua b/util/datetime.lua
index 97dcb8b4eca47a196660e7f08733ce4c67a55127..c73d8e761a3c86db120119f7670082ec487f82be 100644 (file)
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -1,37 +1,57 @@
--- Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
 --
 
 
--- XEP-0082: XMPP Date and Time Profiles\r
-\r
-local os_date = os.date;\r
-local error = error;\r
-\r
-module "datetime"\r
-\r
-function date()\r
-       return os_date("!%Y-%m-%d");\r
-end\r
-\r
-function datetime()\r
-       return os_date("!%Y-%m-%dT%H:%M:%SZ");\r
-end\r
-\r
-function time()\r
-       return os_date("!%H:%M:%S");\r
-end\r
-\r
-function legacy()\r
-       return os_date("!%Y%m%dT%H:%M:%S");\r
-end\r
-\r
-function parse(s)\r
-       error("datetime.parse: Not implemented"); -- TODO\r
-end\r
-\r
-return _M;\r
+-- XEP-0082: XMPP Date and Time Profiles
+
+local os_date = os.date;
+local os_time = os.time;
+local os_difftime = os.difftime;
+local error = error;
+local tonumber = tonumber;
+
+module "datetime"
+
+function date(t)
+       return os_date("!%Y-%m-%d", t);
+end
+
+function datetime(t)
+       return os_date("!%Y-%m-%dT%H:%M:%SZ", t);
+end
+
+function time(t)
+       return os_date("!%H:%M:%S", t);
+end
+
+function legacy(t)
+       return os_date("!%Y%m%dT%H:%M:%S", t);
+end
+
+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+%-].*)$");
+               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*)");
+                               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, isdst=false});
+               end
+       end
+end
+
+return _M;