X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_version.lua;h=2abf534f07aa7e848a777f7bcb69690d7a83126f;hb=ca4fbf6727ea828c8d95a7a9106c12ba5872c2bd;hp=e16d8aa7baa20e3b58ede1b0e4d7b4f21c726db4;hpb=10904eb0553bd5e6efadbd8ab04ed77c49aa03b9;p=prosody.git

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index e16d8aa7..2abf534f 100644
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,40 +1,41 @@
--- Prosody IM v0.1
--- 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.
 --
 
 
 
 local st = require "util.stanza";
 
-local log = require "util.logger".init("mod_version");
-
 local xmlns_version = "jabber:iq:version"
 
-require "core.discomanager".set("version", xmlns_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;
 
-local function handle_version_request(session, stanza)
+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.1"):up()
-			:tag("os"):text("the best operating system ever!"));
+			:tag("version"):text("0.4"):up()
+			:tag("os"):text(version));
 	end
-end
-
-module:add_iq_handler("c2s", xmlns_version, handle_version_request);
-module:add_iq_handler("s2sin", xmlns_version, handle_version_request);
+end);