Merge 0.7->trunk

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index 2abf534f07aa7e848a777f7bcb69690d7a83126f..69e914c0c0aca904e1e51e0a7573d4936f9fb522 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,22 +1,18 @@
--- 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.
 --
 
-
-
 local st = require "util.stanza";
 
-local xmlns_version = "jabber:iq:version"
-
-module:add_feature(xmlns_version);
+module:add_feature("jabber:iq:version");
 
 local version = "the best operating system ever!";
 
-if not require "core.configmanager".get("*", "core", "hide_os_type") then
+if not module:get_option("hide_os_type") then
        if os.getenv("WINDIR") then
                version = "Windows";
        else
@@ -31,11 +27,15 @@ end
 
 version = version:match("^%s*(.-)%s*$") or version;
 
-module:add_iq_handler({"c2s", "s2sin"}, xmlns_version, function(session, stanza)
-       if stanza.attr.type == "get" then
-               session.send(st.reply(stanza):query(xmlns_version)
-                       :tag("name"):text("Prosody"):up()
-                       :tag("version"):text("0.4"):up()
-                       :tag("os"):text(version));
+local query = st.stanza("query", {xmlns = "jabber:iq:version"})
+       :tag("name"):text("Prosody"):up()
+       :tag("version"):text(prosody.version):up()
+       :tag("os"):text(version);
+
+module:hook("iq/host/jabber:iq:version:query", function(event)
+       local stanza = event.stanza;
+       if stanza.attr.type == "get" and stanza.attr.to == module.host then
+               event.origin.send(st.reply(stanza):add_child(query));
+               return true;
        end
 end);