X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdatetime.lua;h=27f28ace7eff560c5b3c7efc1caa0bbc880809e8;hb=79a152bb61900a86c486b62d59be60fa845f8afc;hp=53b1700bbac9a6332ffa0a3e2486510f6d12d6b4;hpb=5466de23f56d2121e384f47fe14f32b4ff5ed587;p=prosody.git

diff --git a/util/datetime.lua b/util/datetime.lua
index 53b1700b..27f28ace 100644
--- a/util/datetime.lua
+++ b/util/datetime.lua
@@ -1,48 +1,63 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- 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
+
+local os_date = os.date;
+local os_time = os.time;
+local os_difftime = os.difftime;
+local error = error;
+local tonumber = tonumber;
+
+local _ENV = nil;
+
+local function date(t)
+	return os_date("!%Y-%m-%d", t);
+end
+
+local function datetime(t)
+	return os_date("!%Y-%m-%dT%H:%M:%SZ", t);
+end
+
+local function time(t)
+	return os_date("!%H:%M:%S", t);
+end
+
+local function legacy(t)
+	return os_date("!%Y%m%dT%H:%M:%S", t);
+end
 
+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+%-]?.*)$");
+		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
 
--- XEP-0082: XMPP Date and Time Profiles
-
-local os_date = os.date;
-local error = error;
-
-module "datetime"
-
-function date()
-	return os_date("!%Y-%m-%d");
-end
-
-function datetime()
-	return os_date("!%Y-%m-%dT%H:%M:%SZ");
-end
-
-function time()
-	return os_date("!%H:%M:%S");
-end
-
-function legacy()
-	return os_date("!%Y%m%dT%H:%M:%S");
-end
-
-function parse(s)
-	error("datetime.parse: Not implemented"); -- TODO
-end
-
-return _M;
+return {
+	date     = date;
+	datetime = datetime;
+	time     = time;
+	legacy   = legacy;
+	parse    = parse;
+};