Merge with 0.4

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index d96da41e15bb794a8bd9504040434c63b8742a9d..2abf534f07aa7e848a777f7bcb69690d7a83126f 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM v0.4
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -14,11 +14,28 @@ local xmlns_version = "jabber:iq:version"
 
 module:add_feature(xmlns_version);
 
+local version = "the best operating system ever!";
+
+if not require "core.configmanager".get("*", "core", "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
+
+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.3"):up()
-                       :tag("os"):text("the best operating system ever!"));
+                       :tag("version"):text("0.4"):up()
+                       :tag("os"):text(version));
        end
 end);