Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Correct lists:keysearch output processing and fix dialyzer warning

This commit is contained in:
Evgeniy Khramtsov 2011-09-26 19:06:34 +10:00
parent e7d12f4b9e
commit 8631dd14e9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod_muc/mod_muc_room.erl
View File

@ -3759,8 +3759,9 @@ is_voice_request(Els) ->
[_|_] = Fields ->
case {lists:keysearch("FORM_TYPE", 1, Fields),
lists:keysearch("muc#role", 1, Fields)} of
{["http://jabber.org/protocol/muc#request"],
["participant"]} ->
{{value,
{_, ["http://jabber.org/protocol/muc#request"]}},
{value, {_, ["participant"]}}} ->
true;
_ ->
false
@ -3792,7 +3793,8 @@ prepare_request_form(Requester, Nick, Lang) ->
?STRINGXFIELD("Requested role", "muc#role", "participant"),
?STRINGXFIELD("User JID", "muc#jid", jlib:jid_to_string(Requester)),
?STRINGXFIELD("Nickname", "muc#roomnick", Nick),
?BOOLXFIELD("Grant voice to this person?", "muc#request_allow", false)
?BOOLXFIELD("Grant voice to this person?", "muc#request_allow",
list_to_atom("false"))
]}]}.
send_voice_request(From, StateData) ->
@ -3816,8 +3818,10 @@ is_voice_approvement(Els) ->
case {lists:keysearch("FORM_TYPE", 1, Fs),
lists:keysearch("muc#role", 1, Fs),
lists:keysearch("muc#request_allow", 1, Fs)} of
{["http://jabber.org/protocol/muc#request"],
["participant"], [Flag]}
{{value,
{_, ["http://jabber.org/protocol/muc#request"]}},
{value, {_, ["participant"]}},
{value, {_, [Flag]}}}
when Flag == "true"; Flag == "1" ->
true;
_ ->