mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-06 21:37:17 +02:00
*src/ejabberd_c2s.erl: Uniform default value for empty privacy list. Fixes (EJAB-603).
SVN Revision: 1281
This commit is contained in:
parent
2af65d4f42
commit
b8b2bde8d0
|
@ -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>
|
2008-04-08 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
* src/ejabberd_auth_ldap.erl: LDAP function to get the number of
|
* src/ejabberd_auth_ldap.erl: LDAP function to get the number of
|
||||||
|
|
|
@ -56,6 +56,7 @@
|
||||||
|
|
||||||
-include("ejabberd.hrl").
|
-include("ejabberd.hrl").
|
||||||
-include("jlib.hrl").
|
-include("jlib.hrl").
|
||||||
|
-include("mod_privacy.hrl").
|
||||||
|
|
||||||
-define(SETS, gb_sets).
|
-define(SETS, gb_sets).
|
||||||
-define(DICT, dict).
|
-define(DICT, dict).
|
||||||
|
@ -84,7 +85,7 @@
|
||||||
pres_last, pres_pri,
|
pres_last, pres_pri,
|
||||||
pres_timestamp,
|
pres_timestamp,
|
||||||
pres_invis = false,
|
pres_invis = false,
|
||||||
privacy_list = none,
|
privacy_list = #userlist{},
|
||||||
conn = unknown,
|
conn = unknown,
|
||||||
ip,
|
ip,
|
||||||
lang}).
|
lang}).
|
||||||
|
@ -342,9 +343,9 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
|
||||||
true ->
|
true ->
|
||||||
send_text(StateData, Header),
|
send_text(StateData, Header),
|
||||||
fsm_next_state(wait_for_auth,
|
fsm_next_state(wait_for_auth,
|
||||||
StateData#state{
|
StateData#state{
|
||||||
server = Server,
|
server = Server,
|
||||||
lang = Lang})
|
lang = Lang})
|
||||||
end
|
end
|
||||||
end;
|
end;
|
||||||
_ ->
|
_ ->
|
||||||
|
@ -458,7 +459,7 @@ wait_for_auth({xmlstreamelement, El}, StateData) ->
|
||||||
PrivList =
|
PrivList =
|
||||||
ejabberd_hooks:run_fold(
|
ejabberd_hooks:run_fold(
|
||||||
privacy_get_user_list, StateData#state.server,
|
privacy_get_user_list, StateData#state.server,
|
||||||
none,
|
#userlist{},
|
||||||
[U, StateData#state.server]),
|
[U, StateData#state.server]),
|
||||||
fsm_next_state(session_established,
|
fsm_next_state(session_established,
|
||||||
StateData#state{
|
StateData#state{
|
||||||
|
@ -806,7 +807,7 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
|
||||||
PrivList =
|
PrivList =
|
||||||
ejabberd_hooks:run_fold(
|
ejabberd_hooks:run_fold(
|
||||||
privacy_get_user_list, StateData#state.server,
|
privacy_get_user_list, StateData#state.server,
|
||||||
none,
|
#userlist{},
|
||||||
[U, StateData#state.server]),
|
[U, StateData#state.server]),
|
||||||
fsm_next_state(session_established,
|
fsm_next_state(session_established,
|
||||||
StateData#state{
|
StateData#state{
|
||||||
|
@ -900,24 +901,18 @@ session_established({xmlstreamelement, El}, StateData) ->
|
||||||
StateData)
|
StateData)
|
||||||
end;
|
end;
|
||||||
"iq" ->
|
"iq" ->
|
||||||
case StateData#state.privacy_list of
|
case jlib:iq_query_info(NewEl) of
|
||||||
none ->
|
#iq{xmlns = ?NS_PRIVACY} = IQ ->
|
||||||
ejabberd_router:route(FromJID, ToJID, NewEl),
|
process_privacy_iq(
|
||||||
StateData;
|
FromJID, ToJID, IQ, StateData);
|
||||||
_PrivList ->
|
_ ->
|
||||||
case jlib:iq_query_info(NewEl) of
|
ejabberd_hooks:run(
|
||||||
#iq{xmlns = ?NS_PRIVACY} = IQ ->
|
user_send_packet,
|
||||||
process_privacy_iq(
|
Server,
|
||||||
FromJID, ToJID, IQ, StateData);
|
[FromJID, ToJID, NewEl]),
|
||||||
_ ->
|
ejabberd_router:route(
|
||||||
ejabberd_hooks:run(
|
FromJID, ToJID, NewEl),
|
||||||
user_send_packet,
|
StateData
|
||||||
Server,
|
|
||||||
[FromJID, ToJID, NewEl]),
|
|
||||||
ejabberd_router:route(
|
|
||||||
FromJID, ToJID, NewEl),
|
|
||||||
StateData
|
|
||||||
end
|
|
||||||
end;
|
end;
|
||||||
"message" ->
|
"message" ->
|
||||||
ejabberd_hooks:run(user_send_packet,
|
ejabberd_hooks:run(user_send_packet,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user