diff options
| author | Mickael Remond <mremond@process-one.net> | 2016-11-09 09:04:58 +0100 |
|---|---|---|
| committer | Mickael Remond <mremond@process-one.net> | 2016-11-09 09:04:58 +0100 |
| commit | 42bede77a1a36c6bbc1ce3c2728e8c3dd78eb5f2 (patch) | |
| tree | 677c46157270f24a40200ebb21beb5ba0397d358 /src/mod_muc_admin.erl | |
| parent | Expose unregister API command (diff) | |
| parent | Support several groups separated by ; in add_rosteritem command (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to 'src/mod_muc_admin.erl')
| -rw-r--r-- | src/mod_muc_admin.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl index e334dca2b..bd1c55f66 100644 --- a/src/mod_muc_admin.erl +++ b/src/mod_muc_admin.erl @@ -432,8 +432,8 @@ create_room(Name1, Host1, ServerHost) -> create_room_with_opts(Name1, Host1, ServerHost, []). create_room_with_opts(Name1, Host1, ServerHost, CustomRoomOpts) -> - Name = jid:nodeprep(Name1), - Host = jid:nodeprep(Host1), + true = (error /= (Name = jid:nodeprep(Name1))), + true = (error /= (Host = jid:nodeprep(Host1))), %% Get the default room options from the muc configuration DefRoomOpts = gen_mod:get_module_opt(ServerHost, mod_muc, @@ -514,7 +514,7 @@ destroy_room({N, H, SH}) -> %% The file encoding must be UTF-8 destroy_rooms_file(Filename) -> - {ok, F} = file:open(Filename, [read, binary]), + {ok, F} = file:open(Filename, [read]), RJID = read_room(F), Rooms = read_rooms(F, RJID, []), file:close(F), @@ -533,7 +533,7 @@ read_room(F) -> eof -> eof; String -> case io_lib:fread("~s", String) of - {ok, [RoomJID], _} -> split_roomjid(RoomJID); + {ok, [RoomJID], _} -> split_roomjid(list_to_binary(RoomJID)); {error, What} -> io:format("Parse error: what: ~p~non the line: ~p~n~n", [What, String]) end @@ -551,7 +551,7 @@ split_roomjid(RoomJID) -> %%---------------------------- create_rooms_file(Filename) -> - {ok, F} = file:open(Filename, [read, binary]), + {ok, F} = file:open(Filename, [read]), RJID = read_room(F), Rooms = read_rooms(F, RJID, []), file:close(F), |