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 0b7ebfaafa9bf58da44e9772c207b24075d52813..04a99af33eb30d64026807bd540b51bb51d3f963 100644 (file)
--- 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 prosody = prosody;
 local st = require "util.stanza";
 
-local log = require "util.logger".init("mod_version");
-
 local xmlns_version = "jabber:iq:version"
 
 module:add_feature(xmlns_version);
 
-local function handle_version_request(session, stanza)
+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.1"):up()
-                       :tag("os"):text("the best operating system ever!"));
+                       :tag("version"):text(prosody.version):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);