Software / code / prosody
Changeset
7067:4c0ec9bd5168
mod_admin_telnet: Remove compat warning about 'console_banner' as a function
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 10 Jan 2016 00:01:28 +0100 |
| parents | 7066:7d5a1fb9bf9e |
| children | 7068:0c494bca43cb |
| files | plugins/mod_admin_telnet.lua |
| diffstat | 1 files changed, 5 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Sat Jan 09 23:54:19 2016 +0100 +++ b/plugins/mod_admin_telnet.lua Sun Jan 10 00:01:28 2016 +0100 @@ -1125,8 +1125,8 @@ ------------- function printbanner(session) - local option = module:get_option("console_banner"); - if option == nil or option == "full" or option == "graphic" then + local option = module:get_option_string("console_banner", "full"); + if option == "full" or option == "graphic" then session.print [[ ____ \ / _ | _ \ _ __ ___ ___ _-_ __| |_ _ @@ -1137,17 +1137,13 @@ ]] end - if option == nil or option == "short" or option == "full" then + if 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 - module:log("warn", "Using functions as value for the console_banner option is no longer supported"); - end + if option ~= "short" and option ~= "full" and option ~= "graphic" then + session.print(option); end end
