Merge 0.7->trunk

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index 2f68fa07d51a4fb61f82ea6a4a057989ce0189de..69e914c0c0aca904e1e51e0a7573d4936f9fb522 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,20 +1,41 @@
+-- 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 log = require "util.logger".init("mod_version");
+module:add_feature("jabber:iq:version");
 
-local xmlns_version = "jabber:iq:version"
+local version = "the best operating system ever!";
 
-require "core.discomanager".set("version", xmlns_version);
-
-local function handle_version_request(session, stanza)
-       if stanza.attr.type == "get" then
-               session.send(st.reply(stanza):query(xmlns_version)
-                       :tag("name"):text("lxmppd"):up()
-                       :tag("version"):text("pre-alpha"):up()
-                       :tag("os"):text("the best operating system ever!"));
+if not module:get_option("hide_os_type") then
+       if os.getenv("WINDIR") then
+               version = "Windows";
+       else
+               local uname = io.popen("uname");
+               if uname then
+                       version = uname:read("*a");
+               else
+                       version = "an OS";
+               end
        end
 end
 
-add_iq_handler("c2s", xmlns_version, handle_version_request);
-add_iq_handler("s2sin", xmlns_version, handle_version_request);
+version = version:match("^%s*(.-)%s*$") or 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);