mod_ping: Convert from Windows line endings

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index 11278a530b4145d0712b007397291f99c484ed07..04a99af33eb30d64026807bd540b51bb51d3f963 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,20 +1,41 @@
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 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 log = require "util.logger".init("mod_version");
+local prosody = prosody;
+local st = require "util.stanza";
 
 local xmlns_version = "jabber:iq:version"
 
-require "core.discomanager".set("version", xmlns_version);
+module:add_feature(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("lxmppd"):up()
-                       :tag("version"):text("pre-alpha"):up()
-                       :tag("os"):text("the best operating system ever!"));
+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
 
-module:add_iq_handler("c2s", xmlns_version, handle_version_request);
-module:add_iq_handler("s2sin", xmlns_version, handle_version_request);
+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(prosody.version):up()
+                       :tag("os"):text(version));
+       end
+end);