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 d351d75bff4a79a743a6264afd4116eaec179aad..52d8d290dcec84044383e3db1afb9f811c1602cd 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -1,20 +1,48 @@
+-- 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 send = require "core.sessionmanager".send_to_session;
 
-local log = require "util.logger".init("mod_version");
+module:add_feature("jabber:iq:version");
 
-local xmlns_version = "jabber:iq:version"
+local 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 one"));
+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
 
-add_iq_handler("c2s", xmlns_version, handle_version_request);
-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);