mod_tls: Update for new server SSL syntax

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index d96da41e15bb794a8bd9504040434c63b8742a9d..9af830f8b3a2f39b5d2b6626d3c5fca54a064320 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -6,19 +6,36 @@
 -- COPYING file in the source package for more information.
 --
 
+local st = require "util.stanza";
 
+module:add_feature("jabber:iq:version");
 
-local st = require "util.stanza";
+local version = "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
 
-local xmlns_version = "jabber:iq:version"
+version = version:match("^%s*(.-)%s*$") or version;
 
-module:add_feature(xmlns_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: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.3"):up()
-                       :tag("os"):text("the best operating system ever!"));
+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);