Merge 0.10->trunk

[prosody.git] / util / datetime.lua

diff --git a/util/datetime.lua b/util/datetime.lua
index a1f62a48563ed48fc2d30c5c1f5e8b94c66e0e17..abb4e867b2aaa51ef2c254a963dcdc019ac69310 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.
 --
@@ -12,28 +12,27 @@
 local os_date = os.date;
 local os_time = os.time;
 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+%-]?.*)$");
@@ -54,4 +53,10 @@ function parse(s)
        end
 end
 
-return _M;
+return {
+       date     = date;
+       datetime = datetime;
+       time     = time;
+       legacy   = legacy;
+       parse    = parse;
+};