mirror of
https://github.com/processone/ejabberd.git
synced 2024-09-21 14:06:57 +02:00
Fix indentation (EJAB-1038)
This commit is contained in:
parent
70cfcb1008
commit
44b282474a
@ -593,19 +593,21 @@ 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 of
|
case (StateData#state.config)#config.public_list of
|
||||||
true ->
|
true ->
|
||||||
Reply = get_roomdesc_reply(StateData, get_roomdesc_tail(StateData, Lang)),
|
Reply = get_roomdesc_reply(StateData,
|
||||||
{reply, Reply, StateName, StateData};
|
get_roomdesc_tail(StateData, Lang)),
|
||||||
_ ->
|
|
||||||
case is_occupant_or_admin(JID, StateData) of
|
|
||||||
true ->
|
|
||||||
Reply = get_roomdesc_reply(StateData, get_roomdesc_tail(StateData, Lang)),
|
|
||||||
{reply, Reply, StateName, StateData};
|
{reply, Reply, StateName, StateData};
|
||||||
_ ->
|
_ ->
|
||||||
{reply, false, StateName, StateData}
|
case is_occupant_or_admin(JID, StateData) of
|
||||||
end
|
true ->
|
||||||
end;
|
Reply = get_roomdesc_reply(StateData, get_roomdesc_tail(
|
||||||
|
StateData, Lang)),
|
||||||
|
{reply, Reply, StateName, StateData};
|
||||||
|
_ ->
|
||||||
|
{reply, false, StateName, StateData}
|
||||||
|
end
|
||||||
|
end;
|
||||||
handle_sync_event(get_config, _From, StateName, StateData) ->
|
handle_sync_event(get_config, _From, StateName, StateData) ->
|
||||||
{reply, {ok, StateData#state.config}, StateName, StateData};
|
{reply, {ok, StateData#state.config}, StateName, StateData};
|
||||||
handle_sync_event(get_state, _From, StateName, StateData) ->
|
handle_sync_event(get_state, _From, StateName, StateData) ->
|
||||||
@ -985,16 +987,16 @@ is_user_online(JID, StateData) ->
|
|||||||
|
|
||||||
%% Check if the user is occupant of the room, or at least is an admin or owner.
|
%% Check if the user is occupant of the room, or at least is an admin or owner.
|
||||||
is_occupant_or_admin(JID, StateData) ->
|
is_occupant_or_admin(JID, StateData) ->
|
||||||
FAffiliation = get_affiliation(JID, StateData),
|
FAffiliation = get_affiliation(JID, StateData),
|
||||||
FRole = get_role(JID, StateData),
|
FRole = get_role(JID, StateData),
|
||||||
case (FRole /= none) orelse
|
case (FRole /= none) orelse
|
||||||
(FAffiliation == admin) orelse
|
(FAffiliation == admin) orelse
|
||||||
(FAffiliation == owner) of
|
(FAffiliation == owner) of
|
||||||
true ->
|
true ->
|
||||||
true;
|
true;
|
||||||
_ ->
|
_ ->
|
||||||
false
|
false
|
||||||
end.
|
end.
|
||||||
|
|
||||||
%%%
|
%%%
|
||||||
%%% Handle IQ queries of vCard
|
%%% Handle IQ queries of vCard
|
||||||
@ -3324,17 +3326,17 @@ 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 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};
|
||||||
_ ->
|
_ ->
|
||||||
case is_occupant_or_admin(From, StateData) of
|
case is_occupant_or_admin(From, StateData) of
|
||||||
true ->
|
true ->
|
||||||
{result, get_mucroom_disco_items(StateData), StateData};
|
{result, get_mucroom_disco_items(StateData), StateData};
|
||||||
_ ->
|
_ ->
|
||||||
{error, ?ERR_FORBIDDEN}
|
{error, ?ERR_FORBIDDEN}
|
||||||
end
|
end
|
||||||
end.
|
end.
|
||||||
|
|
||||||
process_iq_captcha(_From, get, _Lang, _SubEl, _StateData) ->
|
process_iq_captcha(_From, get, _Lang, _SubEl, _StateData) ->
|
||||||
{error, ?ERR_NOT_ALLOWED};
|
{error, ?ERR_NOT_ALLOWED};
|
||||||
@ -3356,33 +3358,33 @@ get_title(StateData) ->
|
|||||||
end.
|
end.
|
||||||
|
|
||||||
get_roomdesc_reply(StateData, Tail) ->
|
get_roomdesc_reply(StateData, Tail) ->
|
||||||
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.
|
||||||
|
|
||||||
get_roomdesc_tail(StateData, Lang) ->
|
get_roomdesc_tail(StateData, Lang) ->
|
||||||
Desc =
|
Desc = case (StateData#state.config)#config.public of
|
||||||
case (StateData#state.config)#config.public of
|
true ->
|
||||||
true ->
|
"";
|
||||||
"";
|
_ ->
|
||||||
_ ->
|
translate:translate(Lang, "private, ")
|
||||||
translate:translate(Lang, "private, ")
|
end,
|
||||||
end,
|
Len = ?DICT:fold(fun(_, _, Acc) -> Acc + 1 end, 0, StateData#state.users),
|
||||||
Len = ?DICT:fold(fun(_, _, Acc) -> Acc + 1 end, 0, StateData#state.users),
|
" (" ++ Desc ++ integer_to_list(Len) ++ ")".
|
||||||
" (" ++ Desc ++ integer_to_list(Len) ++ ")".
|
|
||||||
|
|
||||||
get_mucroom_disco_items(StateData) ->
|
get_mucroom_disco_items(StateData) ->
|
||||||
lists:map(
|
lists:map(
|
||||||
fun({_LJID, Info}) ->
|
fun({_LJID, Info}) ->
|
||||||
Nick = Info#user.nick,
|
Nick = Info#user.nick,
|
||||||
{xmlelement, "item",
|
{xmlelement, "item",
|
||||||
[{"jid", jlib:jid_to_string({StateData#state.room, StateData#state.host,Nick})},
|
[{"jid", jlib:jid_to_string({StateData#state.room,
|
||||||
{"name", Nick}], []}
|
StateData#state.host, Nick})},
|
||||||
end,
|
{"name", Nick}], []}
|
||||||
?DICT:to_list(StateData#state.users)).
|
end,
|
||||||
|
?DICT:to_list(StateData#state.users)).
|
||||||
|
|
||||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||||
% Invitation support
|
% Invitation support
|
||||||
|
Loading…
Reference in New Issue
Block a user