X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_version.lua;h=f3c5c1903376e5663a5b0bcdeb673a83e06ff147;hb=3ea4e9da6700b0032e4002f6804040f501581da2;hp=e577c6f8e6e0ababa96785b8bab5616c6efc55f7;hpb=98d61ca91de44d4d2bb9b596dc8ecd68b34db961;p=prosody.git

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index e577c6f8..f3c5c190 100644
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,41 +1,40 @@
--- Prosody IM v0.3
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
-
-
 local st = require "util.stanza";
 
-local xmlns_version = "jabber:iq:version"
-
-module:add_feature(xmlns_version);
+module:add_feature("jabber:iq:version");
 
 local version = "the best operating system ever!";
 
-if not require "core.configmanager".get("*", "core", "hide_os_type") then
+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 uname = io.popen("uname");
+		local uname = io.popen(module:get_option("os_version_command") or "uname");
 		if uname then
 			version = uname:read("*a");
 		else
 			version = "an OS";
 		end
 	end
+	version = version:match("^%s*(.-)%s*$") or version;
+	query:tag("os"):text(version):up();
 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(version));
+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);