diff options
| author | Tobias Markmann <tm@ayena.de> | 2009-07-05 19:05:25 +0200 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2009-07-05 19:05:25 +0200 |
| commit | fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba (patch) | |
| tree | 04f1aa322632a0221c225ee6957b5863755a3b6d /plugins/mod_console.lua | |
| parent | 4ce313959b678592a5fe0ef30b6813d058de45af (diff) | |
| parent | 2c3ccf56744975a5f5acbc66d2e917e056467965 (diff) | |
| download | prosody-fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba.tar.gz prosody-fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba.zip | |
Merge with main branch.
Diffstat (limited to 'plugins/mod_console.lua')
| -rw-r--r-- | plugins/mod_console.lua | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua index 0f2c6711..966156f8 100644 --- a/plugins/mod_console.lua +++ b/plugins/mod_console.lua @@ -437,6 +437,8 @@ end ------------- function printbanner(session) + local option = config.get("*", "core", "console_banner"); +if option == nil or option == "full" or option == "graphic" then session.print [[ ____ \ / _ | _ \ _ __ ___ ___ _-_ __| |_ _ @@ -446,7 +448,18 @@ session.print [[ A study in simplicity |___/ ]] +end +if option == nil or option == "short" or option == "full" then session.print("Welcome to the Prosody administration console. For a list of commands, type: help"); session.print("You may find more help on using this console in our online documentation at "); session.print("http://prosody.im/doc/console\n"); end +if option and option ~= "short" and option ~= "full" and option ~= "graphic" then + if type(option) == "string" then + session.print(option) + elseif type(option) == "function" then + setfenv(option, redirect_output(_G, session)); + pcall(option, session); + end +end +end |