Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Fix crash in number of occupants; other minor changes (EJAB-1038)

Browse Source
This commit is contained in:
Badlop 2010-03-29 20:51:04 +02:00
parent fa28c8baf6
commit 70cfcb1008
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mod_muc/mod_muc_room.erl
View File

@ -593,17 +593,15 @@ handle_event(_Event, StateName, StateData) ->
%% {stop, Reason, Reply, NewStateData} %% {stop, Reason, Reply, NewStateData}
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
handle_sync_event({get_disco_item, JID, Lang}, _From, StateName, StateData) -> handle_sync_event({get_disco_item, JID, Lang}, _From, StateName, StateData) ->
case ((StateData#state.config)#config.public_list == true) of case (StateData#state.config)#config.public_list of
true -> true ->
get_roomdesc_reply(StateData, StateName, get_roomdesc_tail(StateData, Lang)); Reply = get_roomdesc_reply(StateData, get_roomdesc_tail(StateData, Lang)),
{reply, Reply, StateName, StateData};
_ -> _ ->
Affiliation = get_affiliation(JID, StateData), case is_occupant_or_admin(JID, StateData) of
Role = get_role(JID, StateData),
case (Role /= none) orelse
(Affiliation == admin) orelse
(Affiliation == owner) of
true -> true ->
get_roomdesc_reply(StateData, StateName, get_roomdesc_tail(StateData, Lang)); Reply = get_roomdesc_reply(StateData, get_roomdesc_tail(StateData, Lang)),
{reply, Reply, StateName, StateData};
_ -> _ ->
{reply, false, StateName, StateData} {reply, false, StateName, StateData}
end end
@ -985,6 +983,18 @@ is_user_online(JID, StateData) ->
LJID = jlib:jid_tolower(JID), LJID = jlib:jid_tolower(JID),
?DICT:is_key(LJID, StateData#state.users). ?DICT:is_key(LJID, StateData#state.users).
%% Check if the user is occupant of the room, or at least is an admin or owner.
is_occupant_or_admin(JID, StateData) ->
FAffiliation = get_affiliation(JID, StateData),
FRole = get_role(JID, StateData),
case (FRole /= none) orelse
(FAffiliation == admin) orelse
(FAffiliation == owner) of
true ->
true;
_ ->
false
end.
%%% %%%
%%% Handle IQ queries of vCard %%% Handle IQ queries of vCard
@ -3314,15 +3324,11 @@ process_iq_disco_items(_From, set, _Lang, _StateData) ->
{error, ?ERR_NOT_ALLOWED}; {error, ?ERR_NOT_ALLOWED};
process_iq_disco_items(From, get, _Lang, StateData) -> process_iq_disco_items(From, get, _Lang, StateData) ->
case ((StateData#state.config)#config.public_list == true) of case (StateData#state.config)#config.public_list of
true -> true ->
{result, get_mucroom_disco_items(StateData), StateData}; {result, get_mucroom_disco_items(StateData), StateData};
_ -> _ ->
FAffiliation = get_affiliation(From, StateData), case is_occupant_or_admin(From, StateData) of
FRole = get_role(From, StateData),
case (FRole /= none) orelse
(FAffiliation == admin) orelse
(FAffiliation == owner) of
true -> true ->
{result, get_mucroom_disco_items(StateData), StateData}; {result, get_mucroom_disco_items(StateData), StateData};
_ -> _ ->
@ -3349,15 +3355,13 @@ get_title(StateData) ->
Name Name
end. end.
get_roomdesc_reply(StateData, StateName, Tail) -> get_roomdesc_reply(StateData, Tail) ->
Reply =
case ((StateData#state.config)#config.public == true) of case ((StateData#state.config)#config.public == true) of
true -> true ->
{item, get_title(StateData) ++ Tail}; {item, get_title(StateData) ++ Tail};
_ -> _ ->
false false
end, end.
{reply, Reply, StateName, StateData}.
get_roomdesc_tail(StateData, Lang) -> get_roomdesc_tail(StateData, Lang) ->
Desc = Desc =
@ -3367,8 +3371,8 @@ get_roomdesc_tail(StateData, Lang) ->
_ -> _ ->
translate:translate(Lang, "private, ") translate:translate(Lang, "private, ")
end, end,
Len = ?DICT:fold(fun(_, _, Acc) -> Acc + 1 end, 0, StateData#state.users)," (" ++ Desc ++ integer_to_list(Len) ++ ")", Len = ?DICT:fold(fun(_, _, Acc) -> Acc + 1 end, 0, StateData#state.users),
Len. " (" ++ Desc ++ integer_to_list(Len) ++ ")".
get_mucroom_disco_items(StateData) -> get_mucroom_disco_items(StateData) ->
lists:map( lists:map(