Merge with 0.4

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index 8cc0c702fd65659bd2ed6ae80a7669e00dc94cd0..2abf534f07aa7e848a777f7bcb69690d7a83126f 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
@@ -25,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.2"):up()
-                       :tag("os"):text("the best operating system ever!"));
+                       :tag("version"):text("0.4"):up()
+                       :tag("os"):text(version));
        end
 end);