mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-22 16:20:52 +01:00
Remove compatibility code (not tested yet).
SVN Revision: 1581
This commit is contained in:
parent
d8153b702a
commit
f5f3c85112
@ -15,6 +15,8 @@
|
|||||||
exmpp_stringprep:*prep/1 uses. Add table conversion.
|
exmpp_stringprep:*prep/1 uses. Add table conversion.
|
||||||
(get_last): Do not convert status to binary because it's already one.
|
(get_last): Do not convert status to binary because it's already one.
|
||||||
|
|
||||||
|
* src/mod_adhoc.erl: Remove compatibility code (not tested yet).
|
||||||
|
|
||||||
2008-09-25 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
|
2008-09-25 Jean-Sébastien Pédron <js.pedron@meetic-corp.com>
|
||||||
|
|
||||||
* src/jlib.erl (timestamp_to_xml): Create an #xmlel element, not an
|
* src/jlib.erl (timestamp_to_xml): Create an #xmlel element, not an
|
||||||
|
@ -99,10 +99,7 @@ get_local_commands(Acc, _From, #jid{domain = Server, ldomain = LServer} = _To, "
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
get_local_commands(_Acc, From, #jid{ldomain = LServer} = To, ?NS_ADHOC_s, Lang) ->
|
get_local_commands(_Acc, From, #jid{ldomain = LServer} = To, ?NS_ADHOC_s, Lang) ->
|
||||||
% XXX OLD FORMAT: From, To.
|
ejabberd_hooks:run_fold(adhoc_local_items, LServer, {result, []}, [From, To, Lang]);
|
||||||
FromOld = jlib:to_old_jid(From),
|
|
||||||
ToOld = jlib:to_old_jid(To),
|
|
||||||
ejabberd_hooks:run_fold(adhoc_local_items, LServer, {result, []}, [FromOld, ToOld, Lang]);
|
|
||||||
|
|
||||||
get_local_commands(_Acc, _From, _To, "ping", _Lang) ->
|
get_local_commands(_Acc, _From, _To, "ping", _Lang) ->
|
||||||
{result, []};
|
{result, []};
|
||||||
@ -132,10 +129,7 @@ get_sm_commands(Acc, _From, #jid{ldomain = LServer} = To, "", Lang) ->
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
get_sm_commands(_Acc, From, #jid{ldomain = LServer} = To, ?NS_ADHOC_s, Lang) ->
|
get_sm_commands(_Acc, From, #jid{ldomain = LServer} = To, ?NS_ADHOC_s, Lang) ->
|
||||||
% XXX OLD FORMAT: From, To.
|
ejabberd_hooks:run_fold(adhoc_sm_items, LServer, {result, []}, [From, To, Lang]);
|
||||||
FromOld = jlib:to_old_jid(From),
|
|
||||||
ToOld = jlib:to_old_jid(To),
|
|
||||||
ejabberd_hooks:run_fold(adhoc_sm_items, LServer, {result, []}, [FromOld, ToOld, Lang]);
|
|
||||||
|
|
||||||
get_sm_commands(Acc, _From, _To, _Node, _Lang) ->
|
get_sm_commands(Acc, _From, _To, _Node, _Lang) ->
|
||||||
Acc.
|
Acc.
|
||||||
@ -223,11 +217,8 @@ process_adhoc_request(From, To, IQ_Rec, Hook) ->
|
|||||||
exmpp_iq:error(IQ_Rec, Error);
|
exmpp_iq:error(IQ_Rec, Error);
|
||||||
#adhoc_request{} = AdhocRequest ->
|
#adhoc_request{} = AdhocRequest ->
|
||||||
Host = To#jid.ldomain,
|
Host = To#jid.ldomain,
|
||||||
% XXX OLD FORMAT: From, To.
|
|
||||||
FromOld = jlib:to_old_jid(From),
|
|
||||||
ToOld = jlib:to_old_jid(To),
|
|
||||||
case ejabberd_hooks:run_fold(Hook, Host, empty,
|
case ejabberd_hooks:run_fold(Hook, Host, empty,
|
||||||
[FromOld, ToOld, AdhocRequest]) of
|
[From, To, AdhocRequest]) of
|
||||||
ignore ->
|
ignore ->
|
||||||
ignore;
|
ignore;
|
||||||
empty ->
|
empty ->
|
||||||
|
Loading…
Reference in New Issue
Block a user