mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-30 16:36:29 +01:00
acl doesn't require conversion anymore.
SVN Revision: 1399
This commit is contained in:
parent
ffbf8d5faa
commit
b08ae07347
@ -1306,10 +1306,8 @@ terminate(_Reason, StateName, StateData) ->
|
|||||||
%%%----------------------------------------------------------------------
|
%%%----------------------------------------------------------------------
|
||||||
|
|
||||||
change_shaper(StateData, JID) ->
|
change_shaper(StateData, JID) ->
|
||||||
% XXX OLD FORMAT: JIDOld is an old #jid.
|
|
||||||
JIDOld = jlib:to_old_jid(JID),
|
|
||||||
Shaper = acl:match_rule(StateData#state.server,
|
Shaper = acl:match_rule(StateData#state.server,
|
||||||
StateData#state.shaper, JIDOld),
|
StateData#state.shaper, JID),
|
||||||
(StateData#state.sockmod):change_shaper(StateData#state.socket, Shaper).
|
(StateData#state.sockmod):change_shaper(StateData#state.socket, Shaper).
|
||||||
|
|
||||||
send_text(StateData, Text) ->
|
send_text(StateData, Text) ->
|
||||||
@ -1674,10 +1672,6 @@ presence_broadcast_to_trusted(StateData, From, T, A, Packet) ->
|
|||||||
|
|
||||||
presence_broadcast_first(From, StateData, Packet) ->
|
presence_broadcast_first(From, StateData, Packet) ->
|
||||||
Probe = exmpp_presence:probe(),
|
Probe = exmpp_presence:probe(),
|
||||||
% XXX OLD FORMAT: From, Packet, Probe.
|
|
||||||
FromOld = jlib:to_old_jid(From),
|
|
||||||
PacketOld = exmpp_xml:xmlel_to_xmlelement(Packet,
|
|
||||||
[?DEFAULT_NS], ?PREFIXED_NS),
|
|
||||||
?SETS:fold(fun({U, S, R}, X) ->
|
?SETS:fold(fun({U, S, R}, X) ->
|
||||||
FJID = exmpp_jid:make_jid(U, S, R),
|
FJID = exmpp_jid:make_jid(U, S, R),
|
||||||
ejabberd_router:route(
|
ejabberd_router:route(
|
||||||
@ -1695,8 +1689,11 @@ presence_broadcast_first(From, StateData, Packet) ->
|
|||||||
As = ?SETS:fold(
|
As = ?SETS:fold(
|
||||||
fun({U, S, R} = JID, A) ->
|
fun({U, S, R} = JID, A) ->
|
||||||
FJID = exmpp_jid:make_jid(U, S, R),
|
FJID = exmpp_jid:make_jid(U, S, R),
|
||||||
% XXX OLD FORMAT: FJID.
|
% XXX OLD FORMAT: From, FJID, Packet.
|
||||||
|
FromOld = jlib:to_old_jid(From),
|
||||||
FJIDOld = jlib:to_old_jid(FJID),
|
FJIDOld = jlib:to_old_jid(FJID),
|
||||||
|
PacketOld = exmpp_xml:xmlel_to_xmlelement(Packet,
|
||||||
|
[?DEFAULT_NS], ?PREFIXED_NS),
|
||||||
case ejabberd_hooks:run_fold(
|
case ejabberd_hooks:run_fold(
|
||||||
privacy_check_packet, StateData#state.server,
|
privacy_check_packet, StateData#state.server,
|
||||||
allow,
|
allow,
|
||||||
|
Loading…
Reference in New Issue
Block a user