mod_tls: Mark starttls feature as <required/> if require_s2s_encryption is enabled

[prosody.git] / plugins / mod_uptime.lua

diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index 4b4c28d11000243febdb708b3b3df56a02c5fefb..eb0ca7cc79579b1c9048370d510ce4c5e4f5344e 100644 (file)
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -1,24 +1,35 @@
-\r
-local st = require "util.stanza"\r
-\r
-local jid_split = require "util.jid".split;\r
-local t_concat = table.concat;\r
-\r
-local start_time = os.time();\r
-\r
-require "core.discomanager".set("uptime", "jabber:iq:last");\r
-\r
-module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:last", \r
-       function (origin, stanza)\r
-               if stanza.tags[1].name == "query" then\r
-                       if stanza.attr.type == "get" then\r
-                               local node, host, resource = jid_split(stanza.attr.to);\r
-                               if node or resource then\r
-                                       -- TODO\r
-                               else\r
-                                       origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:last", seconds = tostring(os.difftime(os.time(), start_time))}));\r
-                                       return true;\r
-                               end\r
-                       end\r
-               end\r
-       end);\r
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+
+
+local st = require "util.stanza"
+
+local jid_split = require "util.jid".split;
+local t_concat = table.concat;
+
+local start_time = prosody.start_time;
+
+prosody.events.add_handler("server-started", function () start_time = prosody.start_time end);
+
+module:add_feature("jabber:iq:last");
+
+module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:last", 
+       function (origin, stanza)
+               if stanza.tags[1].name == "query" then
+                       if stanza.attr.type == "get" then
+                               local node, host, resource = jid_split(stanza.attr.to);
+                               if node or resource then
+                                       -- TODO
+                               else
+                                       origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:last", seconds = tostring(os.difftime(os.time(), start_time))}));
+                                       return true;
+                               end
+                       end
+               end
+       end);