diff options
Diffstat (limited to 'src/ejabberd_admin.erl')
| -rw-r--r-- | src/ejabberd_admin.erl | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/ejabberd_admin.erl b/src/ejabberd_admin.erl index 64f8fba7c..50e4f35f7 100644 --- a/src/ejabberd_admin.erl +++ b/src/ejabberd_admin.erl @@ -5,7 +5,7 @@ %%% Created : 7 May 2006 by Mickael Remond <mremond@process-one.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2019 ProcessOne +%%% ejabberd, Copyright (C) 2002-2020 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -388,7 +388,11 @@ get_commands_spec() -> #ejabberd_commands{name = gc, tags = [server], desc = "Force full garbage collection", module = ?MODULE, function = gc, - args = [], result = {res, rescode}} + args = [], result = {res, rescode}}, + #ejabberd_commands{name = man, tags = [documentation], + desc = "Generate Unix manpage for current ejabberd version", + module = ejabberd_doc, function = man, + args = [], result = {res, restuple}} ]. @@ -405,7 +409,7 @@ status() -> false -> {ejabberd_not_running, "ejabberd is not running in that node."}; {value, {_, _, Version}} -> - {ok, io_lib:format("ejabberd ~ts is running in that node", [Version])} + {ok, io_lib:format("ejabberd ~s is running in that node", [Version])} end, {Is_running, String1 ++ String2}. @@ -468,7 +472,7 @@ stop_kindly(DelaySeconds, AnnouncementTextString) -> ok. send_service_message_all_mucs(Subject, AnnouncementText) -> - Message = str:format("~ts~n~ts", [Subject, AnnouncementText]), + Message = str:format("~s~n~s", [Subject, AnnouncementText]), lists:foreach( fun(ServerHost) -> MUCHosts = gen_mod:get_module_opt_hosts(ServerHost, mod_muc), @@ -512,12 +516,12 @@ register(User, Host, Password) -> true -> case ejabberd_auth:try_register(User, Host, Password) of ok -> - {ok, io_lib:format("User ~ts@~ts successfully registered", [User, Host])}; + {ok, io_lib:format("User ~s@~s successfully registered", [User, Host])}; {error, exists} -> - Msg = io_lib:format("User ~ts@~ts already registered", [User, Host]), + Msg = io_lib:format("User ~s@~s already registered", [User, Host]), {error, conflict, 10090, Msg}; {error, Reason} -> - String = io_lib:format("Can't register user ~ts@~ts at node ~p: ~ts", + String = io_lib:format("Can't register user ~s@~s at node ~p: ~s", [User, Host, node(), mod_register:format_error(Reason)]), {error, cannot_register, 10001, String} @@ -550,7 +554,7 @@ registered_vhosts() -> reload_config() -> case ejabberd_config:reload() of - ok -> {ok, ""}; + ok -> ok; Err -> Reason = ejabberd_config:format_error(Err), {error, Reason} @@ -558,7 +562,7 @@ reload_config() -> dump_config(Path) -> case ejabberd_config:dump(Path) of - ok -> {ok, ""}; + ok -> ok; Err -> Reason = ejabberd_config:format_error(Err), {error, Reason} |