X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_version.lua;h=52d8d290dcec84044383e3db1afb9f811c1602cd;hb=0652193326c7b05560541610b60715cce4f22297;hp=e16d8aa7baa20e3b58ede1b0e4d7b4f21c726db4;hpb=dd01eab72e892dc74540c5d2fe197dd646fb8b74;p=prosody.git

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index e16d8aa7..52d8d290 100644
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,40 +1,48 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 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);
-
-local function handle_version_request(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!"));
+module:add_feature("jabber:iq:version");
+
+local version;
+
+local query = st.stanza("query", {xmlns = "jabber:iq:version"})
+	:tag("name"):text("Prosody"):up()
+	:tag("version"):text(prosody.version):up();
+
+if not module:get_option("hide_os_type") then
+	if os.getenv("WINDIR") then
+		version = "Windows";
+	else
+		local os_version_command = module:get_option("os_version_command");
+		local ok pposix = pcall(require, "pposix");
+		if not os_version_command and (ok and pposix and pposix.uname) then
+			version = pposix.uname().sysname;
+		end
+		if not version then
+			local uname = io.popen(os_version_command or "uname");
+			if uname then
+				version = uname:read("*a");
+			end
+			uname:close();
+		end
+	end
+	if version then
+		version = version:match("^%s*(.-)%s*$") or version;
+		query:tag("os"):text(version):up();
 	end
 end
 
-module:add_iq_handler("c2s", xmlns_version, handle_version_request);
-module:add_iq_handler("s2sin", xmlns_version, handle_version_request);
+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);