summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2015-08-12 17:18:41 +0200
committerBadlop <badlop@process-one.net>2015-08-12 17:18:41 +0200
commit279d4b00acbcd6d6aa3e1e72a7169a24b292af07 (patch)
tree181114e8c7822833be05e22b27fc74abb0d36c43
parentChanged API of some mod_muc_admin command arguments (diff)
Fix and document create_rooms_file and destroy_
-rw-r--r--src/mod_muc_admin.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 7d044434..4741a23e 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -81,11 +81,13 @@ commands() ->
result = {res, rescode}},
#ejabberd_commands{name = create_rooms_file, tags = [muc],
desc = "Create the rooms indicated in file",
+ longdesc = "Provide one room JID per line. Rooms will be created after restart.",
module = ?MODULE, function = create_rooms_file,
args = [{file, string}],
result = {res, rescode}},
#ejabberd_commands{name = destroy_rooms_file, tags = [muc],
desc = "Destroy the rooms indicated in file",
+ longdesc = "Provide one room JID per line.",
module = ?MODULE, function = destroy_rooms_file,
args = [{file, string}],
result = {res, rescode}},
@@ -502,7 +504,7 @@ split_roomjid(RoomJID) ->
[Name, Host] = string:tokens(RoomJID, "@"),
[_MUC_service_name | ServerHostList] = string:tokens(Host, "."),
ServerHost = join(ServerHostList, "."),
- {Name, Host, ServerHost}.
+ {list_to_binary(Name), list_to_binary(Host), list_to_binary(ServerHost)}.
%% This function is copied from string:join/2 in Erlang/OTP R12B-1
%% Note that string:join/2 is not implemented in Erlang/OTP R11B