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

*src/ejabberd_c2s.erl: Uniform default value for empty privacy list. Fixes (EJAB-603). 

SVN Revision: 1281
This commit is contained in:
Mickaël Rémond 2008-04-10 08:14:38 +00:00
parent 2af65d4f42
commit b8b2bde8d0
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-04-10 Mickael Remond <mremond@process-one.net>
*src/ejabberd_c2s.erl: Uniform default value for empty privacy
list. Fixex (EJAB-603).
2008-04-08 Badlop <badlop@process-one.net>
* src/ejabberd_auth_ldap.erl: LDAP function to get the number of

43
src/ejabberd_c2s.erl
View File

@ -56,6 +56,7 @@
-include("ejabberd.hrl").
-include("jlib.hrl").
-include("mod_privacy.hrl").
-define(SETS, gb_sets).
-define(DICT, dict).
@ -84,7 +85,7 @@
pres_last, pres_pri,
pres_timestamp,
pres_invis = false,
privacy_list = none,
privacy_list = #userlist{},
conn = unknown,
ip,
lang}).
@ -342,9 +343,9 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
true ->
send_text(StateData, Header),
fsm_next_state(wait_for_auth,
StateData#state{
server = Server,
lang = Lang})
StateData#state{
server = Server,
lang = Lang})
end
end;
_ ->
@ -458,7 +459,7 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
PrivList =
ejabberd_hooks:run_fold(
privacy_get_user_list, StateData#state.server,
none,
#userlist{},
[U, StateData#state.server]),
fsm_next_state(session_established,
StateData#state{
@ -806,7 +807,7 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
PrivList =
ejabberd_hooks:run_fold(
privacy_get_user_list, StateData#state.server,
none,
#userlist{},
[U, StateData#state.server]),
fsm_next_state(session_established,
StateData#state{
@ -900,24 +901,18 @@ session_established({xmlstreamelement, El}, StateData) ->
StateData)
end;
"iq" ->
case StateData#state.privacy_list of
none ->
ejabberd_router:route(FromJID, ToJID, NewEl),
StateData;
_PrivList ->
case jlib:iq_query_info(NewEl) of
#iq{xmlns = ?NS_PRIVACY} = IQ ->
process_privacy_iq(
FromJID, ToJID, IQ, StateData);
_ ->
ejabberd_hooks:run(
user_send_packet,
Server,
[FromJID, ToJID, NewEl]),
ejabberd_router:route(
FromJID, ToJID, NewEl),
StateData
end
case jlib:iq_query_info(NewEl) of
#iq{xmlns = ?NS_PRIVACY} = IQ ->
process_privacy_iq(
FromJID, ToJID, IQ, StateData);
_ ->
ejabberd_hooks:run(
user_send_packet,
Server,
[FromJID, ToJID, NewEl]),
ejabberd_router:route(
FromJID, ToJID, NewEl),
StateData
end;
"message" ->
ejabberd_hooks:run(user_send_packet,