mod_storage_sql: Log error when failing to update MySQL schema

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index e577c6f8e6e0ababa96785b8bab5616c6efc55f7..52d8d290dcec84044383e3db1afb9f811c1602cd 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,41 +1,48 @@
--- 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("jabber:iq:version");
 
-module:add_feature(xmlns_version);
+local version;
 
-local version = "the best operating system ever!";
+local query = st.stanza("query", {xmlns = "jabber:iq:version"})
+       :tag("name"):text("Prosody"):up()
+       :tag("version"):text(prosody.version):up();
 
-if not require "core.configmanager".get("*", "core", "hide_os_type") then
+if not module:get_option("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";
+               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
 
-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);