X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_version.lua;h=04a99af33eb30d64026807bd540b51bb51d3f963;hb=44f09995e0ba0ba89353b327f0b0a02c107eacac;hp=d96da41e15bb794a8bd9504040434c63b8742a9d;hpb=a4d1701bd5e08cce7b221200394776a3171ddcac;p=prosody.git

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index d96da41e..04a99af3 100644
--- 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
 -- 
@@ -7,18 +7,35 @@
 --
 
 
-
+local prosody = prosody;
 local st = require "util.stanza";
 
 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(prosody.version):up()
+			:tag("os"):text(version));
 	end
 end);