Some mod_console updates

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 4471dccb95323626a2b3cf0fdf00d35f20b4975b..8b123df4d86f7a3485f1f1a1543cb4bc2dae6863 100644 (file)
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -37,7 +37,7 @@ function console_listener.listener(conn, data)
                -- Handle new connection\r
                session = console:new_session(conn);\r
                sessions[conn] = session;\r
-               session.print("Welcome to the lxmppd admin console!");\r
+               printbanner(session);\r
        end\r
        if data then\r
                -- Handle data\r
@@ -129,9 +129,9 @@ function def_env.server:reload()
 end\r
 \r
 def_env.module = {};\r
-function def_env.module:load(name)\r
+function def_env.module:load(name, host)\r
        local mm = require "modulemanager";\r
-       local ok, err = mm.load(name);\r
+       local ok, err = mm.load(host or self.env.host, name);\r
        if not ok then\r
                return false, err or "Unknown error loading module";\r
        end\r
@@ -163,3 +163,20 @@ end
 \r
 function def_env.hosts:add(name)\r
 end\r
+\r
+-------------\r
+\r
+function printbanner(session)\r
+session.print [[\r
+                   ____                \   /     _       \r
+                    |  _ \ _ __ ___  ___  _-_   __| |_   _ \r
+                    | |_) | '__/ _ \/ __|/ _ \ / _` | | | |\r
+                    |  __/| | | (_) \__ \ |_| | (_| | |_| |\r
+                    |_|   |_|  \___/|___/\___/ \__,_|\__, |\r
+                    A study in simplicity            |___/ \r
+\r
+]]\r
+session.print("Welcome to the Prosody administration console. For a list of commands, type: help");\r
+session.print("You may find more help on using this console in our online documentation at ");\r
+session.print("http://prosody.im/doc/console\n");\r
+end\r