25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00

Use more pattern-matching

This commit is contained in:
Maxim Ignatenko 2011-09-20 20:27:08 +03:00
parent a91ae03dc6
commit f919349173

View File

@ -3735,18 +3735,12 @@ is_voice_request({xmlelement, "x", _, _} = Elem) ->
end;
is_voice_request(Els) ->
lists:foldl(
fun(X, Acc) ->
case Acc of
false ->
case X of
{xmlelement, "x", _, _} ->
fun(_, true) ->
true;
({xmlelement, "x", _, _} = X, false) ->
is_voice_request(X);
_ ->
(_, _) ->
false
end;
true ->
true
end
end, false, Els).
check_voice_request_fields(_, false) ->
@ -3805,18 +3799,12 @@ is_voice_approvement({xmlelement, "x", _, _} = Elem) ->
end;
is_voice_approvement(Els) ->
lists:foldl(
fun(X, Acc) ->
case Acc of
false ->
case X of
{xmlelement, "x", _, _} ->
fun(_, true) ->
true;
({xmlelement, "x", _, _} = X, false) ->
is_voice_approvement(X);
_ ->
(_, _) ->
false
end;
true ->
true
end
end, false, Els).
check_voice_approvement_fields(_, false) ->
@ -3836,7 +3824,7 @@ check_voice_approvement_fields({"muc#request_allow", "1"}, true) ->
check_voice_approvement_fields({"muc#request_allow", _}, _) ->
false;
check_voice_approvement_fields(_, true) ->
true; % do not check any other fields
true. % do not check any other fields
extract_jid_from_voice_approvement(Els) ->
lists:foldl(