mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-14 22:00:16 +02:00
API renaming : parse_jid -> parse
SVN Revision: 2122
This commit is contained in:
parent
a136192db2
commit
526dc54173
|
@ -840,7 +840,7 @@ session_established2(El, StateData) ->
|
||||||
undefined ->
|
undefined ->
|
||||||
exmpp_jid:bare(StateData#state.jid);
|
exmpp_jid:bare(StateData#state.jid);
|
||||||
_ ->
|
_ ->
|
||||||
exmpp_jid:parse_jid(To)
|
exmpp_jid:parse(To)
|
||||||
end,
|
end,
|
||||||
NewEl = case exmpp_stanza:get_lang(El) of
|
NewEl = case exmpp_stanza:get_lang(El) of
|
||||||
undefined ->
|
undefined ->
|
||||||
|
@ -1919,7 +1919,7 @@ check_from(El, FromJID) ->
|
||||||
El;
|
El;
|
||||||
{value, SJID} ->
|
{value, SJID} ->
|
||||||
try
|
try
|
||||||
JIDEl = exmpp_jid:parse_jid(SJID),
|
JIDEl = exmpp_jid:parse(SJID),
|
||||||
case exmpp_jid:lresource(JIDEl) of
|
case exmpp_jid:lresource(JIDEl) of
|
||||||
undefined ->
|
undefined ->
|
||||||
%% Matching JID: The stanza is ok
|
%% Matching JID: The stanza is ok
|
||||||
|
|
|
@ -371,7 +371,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
|
||||||
error;
|
error;
|
||||||
F ->
|
F ->
|
||||||
try
|
try
|
||||||
exmpp_jid:parse_jid(F)
|
exmpp_jid:parse(F)
|
||||||
catch
|
catch
|
||||||
_Exception1 -> error
|
_Exception1 -> error
|
||||||
end
|
end
|
||||||
|
@ -381,7 +381,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
|
||||||
error;
|
error;
|
||||||
T ->
|
T ->
|
||||||
try
|
try
|
||||||
exmpp_jid:parse_jid(T)
|
exmpp_jid:parse(T)
|
||||||
catch
|
catch
|
||||||
_Exception2 -> error
|
_Exception2 -> error
|
||||||
end
|
end
|
||||||
|
@ -641,7 +641,7 @@ get_cert_domains(Cert) ->
|
||||||
end,
|
end,
|
||||||
if
|
if
|
||||||
D /= error ->
|
D /= error ->
|
||||||
JID = exmpp_jid:parse_jid(D),
|
JID = exmpp_jid:parse(D),
|
||||||
case {exmpp_jid:lnode_as_list(JID),
|
case {exmpp_jid:lnode_as_list(JID),
|
||||||
exmpp_jid:ldomain_as_list(JID),
|
exmpp_jid:ldomain_as_list(JID),
|
||||||
exmpp_jid:lresource_as_list(JID)} of
|
exmpp_jid:lresource_as_list(JID)} of
|
||||||
|
@ -677,7 +677,7 @@ get_cert_domains(Cert) ->
|
||||||
case 'XmppAddr':decode(
|
case 'XmppAddr':decode(
|
||||||
'XmppAddr', XmppAddr) of
|
'XmppAddr', XmppAddr) of
|
||||||
{ok, D} when is_binary(D) ->
|
{ok, D} when is_binary(D) ->
|
||||||
JID2 = exmpp_jid:parse_jid(binary_to_list(D)),
|
JID2 = exmpp_jid:parse(binary_to_list(D)),
|
||||||
case {exmpp_jid:lnode_as_list(JID2),
|
case {exmpp_jid:lnode_as_list(JID2),
|
||||||
exmpp_jid:ldomain_as_list(JID2),
|
exmpp_jid:ldomain_as_list(JID2),
|
||||||
exmpp_jid:lresource_as_list(JID2)} of
|
exmpp_jid:lresource_as_list(JID2)} of
|
||||||
|
@ -695,7 +695,7 @@ get_cert_domains(Cert) ->
|
||||||
[]
|
[]
|
||||||
end;
|
end;
|
||||||
({dNSName, D}) when is_list(D) ->
|
({dNSName, D}) when is_list(D) ->
|
||||||
JID3 = exmpp_jid:parse_jid(D),
|
JID3 = exmpp_jid:parse(D),
|
||||||
case {exmpp_jid:lnode_as_list(JID3),
|
case {exmpp_jid:lnode_as_list(JID3),
|
||||||
exmpp_jid:ldomain_as_list(JID3),
|
exmpp_jid:ldomain_as_list(JID3),
|
||||||
exmpp_jid:lresource_as_list(JID3)} of
|
exmpp_jid:lresource_as_list(JID3)} of
|
||||||
|
|
|
@ -855,8 +855,8 @@ bounce_element(El, Condition) ->
|
||||||
<<"result">> -> ok;
|
<<"result">> -> ok;
|
||||||
_ ->
|
_ ->
|
||||||
Err = exmpp_stanza:reply_with_error(El, Condition),
|
Err = exmpp_stanza:reply_with_error(El, Condition),
|
||||||
From = exmpp_jid:parse_jid(exmpp_stanza:get_sender(El)),
|
From = exmpp_jid:parse(exmpp_stanza:get_sender(El)),
|
||||||
To = exmpp_jid:parse_jid(exmpp_stanza:get_recipient(El)),
|
To = exmpp_jid:parse(exmpp_stanza:get_recipient(El)),
|
||||||
% No namespace conversion (:server <-> :client) is done.
|
% No namespace conversion (:server <-> :client) is done.
|
||||||
% This is handled by C2S and S2S send_element functions.
|
% This is handled by C2S and S2S send_element functions.
|
||||||
ejabberd_router:route(To, From, Err)
|
ejabberd_router:route(To, From, Err)
|
||||||
|
|
|
@ -227,10 +227,10 @@ stream_established({xmlstreamelement, El}, StateData) ->
|
||||||
%% when accept packets from any address.
|
%% when accept packets from any address.
|
||||||
%% In this case, the component can send packet of
|
%% In this case, the component can send packet of
|
||||||
%% behalf of the server users.
|
%% behalf of the server users.
|
||||||
false -> exmpp_jid:parse_jid(From);
|
false -> exmpp_jid:parse(From);
|
||||||
%% The default is the standard behaviour in XEP-0114
|
%% The default is the standard behaviour in XEP-0114
|
||||||
_ ->
|
_ ->
|
||||||
FromJID1 = exmpp_jid:parse_jid(From),
|
FromJID1 = exmpp_jid:parse(From),
|
||||||
Server = exmpp_jid:ldomain(FromJID1),
|
Server = exmpp_jid:ldomain(FromJID1),
|
||||||
case lists:member(Server, StateData#state.hosts) of
|
case lists:member(Server, StateData#state.hosts) of
|
||||||
true -> FromJID1;
|
true -> FromJID1;
|
||||||
|
@ -240,7 +240,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
|
||||||
To = exmpp_stanza:get_recipient(El),
|
To = exmpp_stanza:get_recipient(El),
|
||||||
ToJID = case To of
|
ToJID = case To of
|
||||||
undefined -> error;
|
undefined -> error;
|
||||||
_ -> exmpp_jid:parse_jid(To)
|
_ -> exmpp_jid:parse(To)
|
||||||
end,
|
end,
|
||||||
if ((El#xmlel.name == 'iq') or
|
if ((El#xmlel.name == 'iq') or
|
||||||
(El#xmlel.name == 'message') or
|
(El#xmlel.name == 'message') or
|
||||||
|
|
|
@ -194,7 +194,7 @@ process_large_heap(Pid, Info) ->
|
||||||
lists:foreach(
|
lists:foreach(
|
||||||
fun(S) ->
|
fun(S) ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(S),
|
JID = exmpp_jid:parse(S),
|
||||||
send_message(From, JID, Body)
|
send_message(From, JID, Body)
|
||||||
catch
|
catch
|
||||||
_ ->
|
_ ->
|
||||||
|
@ -216,7 +216,7 @@ get_admin_jids() ->
|
||||||
lists:flatmap(
|
lists:flatmap(
|
||||||
fun(S) ->
|
fun(S) ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(S),
|
JID = exmpp_jid:parse(S),
|
||||||
[{exmpp_jid:lnode(JID),
|
[{exmpp_jid:lnode(JID),
|
||||||
exmpp_jid:ldomain(JID),
|
exmpp_jid:ldomain(JID),
|
||||||
exmpp_jid:lresource(JID)}]
|
exmpp_jid:lresource(JID)}]
|
||||||
|
|
|
@ -195,7 +195,7 @@ process_offline(Server, To, #xmlel{children = Els}) ->
|
||||||
exmpp_jid:make(Server);
|
exmpp_jid:make(Server);
|
||||||
_ ->
|
_ ->
|
||||||
try
|
try
|
||||||
exmpp_jid:parse_jid(FromS)
|
exmpp_jid:parse(FromS)
|
||||||
catch
|
catch
|
||||||
_ ->
|
_ ->
|
||||||
error
|
error
|
||||||
|
|
|
@ -1562,7 +1562,7 @@ set_form(From, Host, ?NS_ADMINL("add-user"), _Lang, XData) ->
|
||||||
AccountString = get_value("accountjid", XData),
|
AccountString = get_value("accountjid", XData),
|
||||||
Password = get_value("password", XData),
|
Password = get_value("password", XData),
|
||||||
Password = get_value("password-verify", XData),
|
Password = get_value("password-verify", XData),
|
||||||
AccountJID = exmpp_jid:parse_jid(AccountString),
|
AccountJID = exmpp_jid:parse(AccountString),
|
||||||
User = exmpp_jid:lnode_as_list(AccountJID),
|
User = exmpp_jid:lnode_as_list(AccountJID),
|
||||||
Server = exmpp_jid:ldomain_as_list(AccountJID),
|
Server = exmpp_jid:ldomain_as_list(AccountJID),
|
||||||
true = lists:member(Server, ?MYHOSTS),
|
true = lists:member(Server, ?MYHOSTS),
|
||||||
|
@ -1575,7 +1575,7 @@ set_form(From, Host, ?NS_ADMINL("delete-user"), _Lang, XData) ->
|
||||||
[_|_] = AccountStringList,
|
[_|_] = AccountStringList,
|
||||||
ASL2 = lists:map(
|
ASL2 = lists:map(
|
||||||
fun(AccountString) ->
|
fun(AccountString) ->
|
||||||
JID = exmpp_jid:parse_jid(AccountString),
|
JID = exmpp_jid:parse(AccountString),
|
||||||
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
||||||
Server = exmpp_jid:ldomain_as_list(JID),
|
Server = exmpp_jid:ldomain_as_list(JID),
|
||||||
true = (Server == Host) orelse (get_permission_level(From) == global),
|
true = (Server == Host) orelse (get_permission_level(From) == global),
|
||||||
|
@ -1588,7 +1588,7 @@ set_form(From, Host, ?NS_ADMINL("delete-user"), _Lang, XData) ->
|
||||||
|
|
||||||
set_form(From, Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
|
set_form(From, Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
|
||||||
AccountString = get_value("accountjid", XData),
|
AccountString = get_value("accountjid", XData),
|
||||||
JID = exmpp_jid:parse_jid(AccountString),
|
JID = exmpp_jid:parse(AccountString),
|
||||||
LUser = [_|_] = exmpp_jid:lnode_as_list(JID),
|
LUser = [_|_] = exmpp_jid:lnode_as_list(JID),
|
||||||
LServer = exmpp_jid:ldomain_as_list(JID),
|
LServer = exmpp_jid:ldomain_as_list(JID),
|
||||||
true = (LServer == Host) orelse (get_permission_level(From) == global),
|
true = (LServer == Host) orelse (get_permission_level(From) == global),
|
||||||
|
@ -1607,7 +1607,7 @@ set_form(From, Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
|
||||||
|
|
||||||
set_form(From, Host, ?NS_ADMINL("get-user-password"), Lang, XData) ->
|
set_form(From, Host, ?NS_ADMINL("get-user-password"), Lang, XData) ->
|
||||||
AccountString = get_value("accountjid", XData),
|
AccountString = get_value("accountjid", XData),
|
||||||
JID = exmpp_jid:parse_jid(AccountString),
|
JID = exmpp_jid:parse(AccountString),
|
||||||
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
||||||
Server = exmpp_jid:ldomain_as_list(JID),
|
Server = exmpp_jid:ldomain_as_list(JID),
|
||||||
true = (Server == Host) orelse (get_permission_level(From) == global),
|
true = (Server == Host) orelse (get_permission_level(From) == global),
|
||||||
|
@ -1622,7 +1622,7 @@ set_form(From, Host, ?NS_ADMINL("get-user-password"), Lang, XData) ->
|
||||||
set_form(From, Host, ?NS_ADMINL("change-user-password"), _Lang, XData) ->
|
set_form(From, Host, ?NS_ADMINL("change-user-password"), _Lang, XData) ->
|
||||||
AccountString = get_value("accountjid", XData),
|
AccountString = get_value("accountjid", XData),
|
||||||
Password = get_value("password", XData),
|
Password = get_value("password", XData),
|
||||||
JID = exmpp_jid:parse_jid(AccountString),
|
JID = exmpp_jid:parse(AccountString),
|
||||||
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
||||||
Server = exmpp_jid:ldomain_as_list(JID),
|
Server = exmpp_jid:ldomain_as_list(JID),
|
||||||
true = (Server == Host) orelse (get_permission_level(From) == global),
|
true = (Server == Host) orelse (get_permission_level(From) == global),
|
||||||
|
@ -1632,7 +1632,7 @@ set_form(From, Host, ?NS_ADMINL("change-user-password"), _Lang, XData) ->
|
||||||
|
|
||||||
set_form(From, Host, ?NS_ADMINL("get-user-lastlogin"), Lang, XData) ->
|
set_form(From, Host, ?NS_ADMINL("get-user-lastlogin"), Lang, XData) ->
|
||||||
AccountString = get_value("accountjid", XData),
|
AccountString = get_value("accountjid", XData),
|
||||||
JID = exmpp_jid:parse_jid(AccountString),
|
JID = exmpp_jid:parse(AccountString),
|
||||||
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
||||||
Server = exmpp_jid:ldomain_as_list(JID),
|
Server = exmpp_jid:ldomain_as_list(JID),
|
||||||
true = (Server == Host) orelse (get_permission_level(From) == global),
|
true = (Server == Host) orelse (get_permission_level(From) == global),
|
||||||
|
@ -1670,7 +1670,7 @@ set_form(From, Host, ?NS_ADMINL("get-user-lastlogin"), Lang, XData) ->
|
||||||
|
|
||||||
set_form(From, Host, ?NS_ADMINL("user-stats"), Lang, XData) ->
|
set_form(From, Host, ?NS_ADMINL("user-stats"), Lang, XData) ->
|
||||||
AccountString = get_value("accountjid", XData),
|
AccountString = get_value("accountjid", XData),
|
||||||
JID = exmpp_jid:parse_jid(AccountString),
|
JID = exmpp_jid:parse(AccountString),
|
||||||
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
User = [_|_] = exmpp_jid:lnode_as_list(JID),
|
||||||
Server = exmpp_jid:ldomain_as_list(JID),
|
Server = exmpp_jid:ldomain_as_list(JID),
|
||||||
true = (Server == Host) orelse (get_permission_level(From) == global),
|
true = (Server == Host) orelse (get_permission_level(From) == global),
|
||||||
|
|
|
@ -632,8 +632,8 @@ bounce_messages(Reason) ->
|
||||||
attrs = [?XMLATTR('code', <<"502">>)],
|
attrs = [?XMLATTR('code', <<"502">>)],
|
||||||
children = [#xmlcdata{cdata = Reason}]},
|
children = [#xmlcdata{cdata = Reason}]},
|
||||||
Err = exmpp_stanza:reply_with_error(El, Error),
|
Err = exmpp_stanza:reply_with_error(El, Error),
|
||||||
From = exmpp_jid:parse_jid(exmpp_stanza:get_sender(El)),
|
From = exmpp_jid:parse(exmpp_stanza:get_sender(El)),
|
||||||
To = exmpp_jid:parse_jid(exmpp_stanza:get_recipient(El)),
|
To = exmpp_jid:parse(exmpp_stanza:get_recipient(El)),
|
||||||
ejabberd_router:route(To, From, Err)
|
ejabberd_router:route(To, From, Err)
|
||||||
end,
|
end,
|
||||||
bounce_messages(Reason)
|
bounce_messages(Reason)
|
||||||
|
|
|
@ -271,7 +271,7 @@ build_filename_string(TimeStamp, OutDir, RoomJID, DirType, DirName, FileFormat)
|
||||||
{Fd, Fn, Fnrel}.
|
{Fd, Fn, Fnrel}.
|
||||||
|
|
||||||
get_room_name(RoomJID) ->
|
get_room_name(RoomJID) ->
|
||||||
JID = exmpp_jid:parse_jid(RoomJID),
|
JID = exmpp_jid:parse(RoomJID),
|
||||||
exmpp_jid:node_as_list(JID).
|
exmpp_jid:node_as_list(JID).
|
||||||
|
|
||||||
%% calculate day before
|
%% calculate day before
|
||||||
|
|
|
@ -2294,7 +2294,7 @@ find_changed_items(UJID, UAffiliation, URole,
|
||||||
Lang, StateData, Res) ->
|
Lang, StateData, Res) ->
|
||||||
TJID = case exmpp_xml:get_attribute_as_binary(Item, 'jid',false) of
|
TJID = case exmpp_xml:get_attribute_as_binary(Item, 'jid',false) of
|
||||||
S when S =/= false ->
|
S when S =/= false ->
|
||||||
try exmpp_jid:parse_jid(S) of
|
try exmpp_jid:parse(S) of
|
||||||
J ->
|
J ->
|
||||||
{value, J}
|
{value, J}
|
||||||
catch
|
catch
|
||||||
|
@ -3344,7 +3344,7 @@ check_invitation(From, Els, Lang, StateData) ->
|
||||||
_ ->
|
_ ->
|
||||||
throw({error, 'bad-request'})
|
throw({error, 'bad-request'})
|
||||||
end,
|
end,
|
||||||
JID = try exmpp_jid:parse_jid(exmpp_xml:get_attribute_as_binary(InviteEl,
|
JID = try exmpp_jid:parse(exmpp_xml:get_attribute_as_binary(InviteEl,
|
||||||
'to',
|
'to',
|
||||||
false)) of
|
false)) of
|
||||||
JID1 -> JID1
|
JID1 -> JID1
|
||||||
|
@ -3447,7 +3447,7 @@ check_decline_invitation(Packet) ->
|
||||||
#xmlel{ns = ?NS_MUC_USER} = XEl = exmpp_xml:get_element(Packet, 'x'),
|
#xmlel{ns = ?NS_MUC_USER} = XEl = exmpp_xml:get_element(Packet, 'x'),
|
||||||
DEl = exmpp_xml:get_element(XEl, 'decline'),
|
DEl = exmpp_xml:get_element(XEl, 'decline'),
|
||||||
ToString = exmpp_xml:get_attribute_as_binary(DEl, 'to', false),
|
ToString = exmpp_xml:get_attribute_as_binary(DEl, 'to', false),
|
||||||
ToJID = exmpp_jid:parse_jid(ToString),
|
ToJID = exmpp_jid:parse(ToString),
|
||||||
{true, {Packet, XEl, DEl, ToJID}}.
|
{true, {Packet, XEl, DEl, ToJID}}.
|
||||||
|
|
||||||
%% Send the decline to the inviter user.
|
%% Send the decline to the inviter user.
|
||||||
|
|
|
@ -257,9 +257,9 @@ pop_offline_messages(Ls, User, Server)
|
||||||
[El] = exmpp_xml:parse_document(XML,
|
[El] = exmpp_xml:parse_document(XML,
|
||||||
[names_as_atom, {check_elems, xmpp},
|
[names_as_atom, {check_elems, xmpp},
|
||||||
{check_nss,xmpp}, {check_attrs,xmpp}]),
|
{check_nss,xmpp}, {check_attrs,xmpp}]),
|
||||||
To = exmpp_jid:parse_jid(
|
To = exmpp_jid:parse(
|
||||||
exmpp_stanza:get_recipient(El)),
|
exmpp_stanza:get_recipient(El)),
|
||||||
From = exmpp_jid:parse_jid(
|
From = exmpp_jid:parse(
|
||||||
exmpp_stanza:get_sender(El)),
|
exmpp_stanza:get_sender(El)),
|
||||||
[{route, From, To, El}]
|
[{route, From, To, El}]
|
||||||
catch
|
catch
|
||||||
|
|
|
@ -444,7 +444,7 @@ parse_items([El = #xmlel{name = item} | Els], Res) ->
|
||||||
case T of
|
case T of
|
||||||
"jid" ->
|
"jid" ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(V),
|
JID = exmpp_jid:parse(V),
|
||||||
I1#listitem{
|
I1#listitem{
|
||||||
type = jid,
|
type = jid,
|
||||||
value = jlib:short_prepd_jid(JID)}
|
value = jlib:short_prepd_jid(JID)}
|
||||||
|
|
|
@ -445,7 +445,7 @@ parse_items([El = #xmlel{name = item} | Els], Res) ->
|
||||||
case T of
|
case T of
|
||||||
"jid" ->
|
"jid" ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(V),
|
JID = exmpp_jid:parse(V),
|
||||||
I1#listitem{
|
I1#listitem{
|
||||||
type = jid,
|
type = jid,
|
||||||
value = jlib:short_prepd_jid(JID)}
|
value = jlib:short_prepd_jid(JID)}
|
||||||
|
@ -693,7 +693,7 @@ raw_to_item({SType, SValue, SAction, SOrder, SMatchAll, SMatchIQ,
|
||||||
"n" ->
|
"n" ->
|
||||||
{none, none};
|
{none, none};
|
||||||
"j" ->
|
"j" ->
|
||||||
JID = exmpp_jid:parse_jid(SValue),
|
JID = exmpp_jid:parse(SValue),
|
||||||
{jid, jlib:short_prepd_jid(JID)};
|
{jid, jlib:short_prepd_jid(JID)};
|
||||||
"g" ->
|
"g" ->
|
||||||
{group, SValue};
|
{group, SValue};
|
||||||
|
|
|
@ -160,7 +160,7 @@ process_iq(InitiatorJID, #iq{type = set, payload = SubEl, ns = ?NS_BYTESTREAMS}
|
||||||
allow ->
|
allow ->
|
||||||
ActivateEl = exmpp_xml:get_path(SubEl, [{element, 'activate'}]),
|
ActivateEl = exmpp_xml:get_path(SubEl, [{element, 'activate'}]),
|
||||||
SID = exmpp_xml:get_attribute_as_list(SubEl, 'sid', ""),
|
SID = exmpp_xml:get_attribute_as_list(SubEl, 'sid', ""),
|
||||||
case catch exmpp_jid:parse_jid(exmpp_xml:get_cdata_as_string(ActivateEl)) of
|
case catch exmpp_jid:parse(exmpp_xml:get_cdata_as_string(ActivateEl)) of
|
||||||
TargetJID when ?IS_JID(TargetJID), SID /= "",
|
TargetJID when ?IS_JID(TargetJID), SID /= "",
|
||||||
length(SID) =< 128, TargetJID /= InitiatorJID ->
|
length(SID) =< 128, TargetJID /= InitiatorJID ->
|
||||||
Target = exmpp_jid:prepd_jid_to_list(TargetJID),
|
Target = exmpp_jid:prepd_jid_to_list(TargetJID),
|
||||||
|
|
|
@ -1310,7 +1310,7 @@ handle_authorization_response(Host, From, To, Packet, XFields) ->
|
||||||
{_, _, _} -> [SNode];
|
{_, _, _} -> [SNode];
|
||||||
_ -> string:tokens(SNode, "/")
|
_ -> string:tokens(SNode, "/")
|
||||||
end,
|
end,
|
||||||
Subscriber = exmpp_jid:parse_jid(SSubscriber),
|
Subscriber = exmpp_jid:parse(SSubscriber),
|
||||||
Allow = case SAllow of
|
Allow = case SAllow of
|
||||||
"1" -> true;
|
"1" -> true;
|
||||||
"true" -> true;
|
"true" -> true;
|
||||||
|
@ -1587,7 +1587,7 @@ delete_node(Host, Node, Owner) ->
|
||||||
%%</ul>
|
%%</ul>
|
||||||
subscribe_node(Host, Node, From, JID) ->
|
subscribe_node(Host, Node, From, JID) ->
|
||||||
Subscriber = try
|
Subscriber = try
|
||||||
jlib:short_prepd_jid(exmpp_jid:parse_jid(JID))
|
jlib:short_prepd_jid(exmpp_jid:parse(JID))
|
||||||
catch
|
catch
|
||||||
_:_ ->
|
_:_ ->
|
||||||
{undefined, undefined, undefined}
|
{undefined, undefined, undefined}
|
||||||
|
@ -1684,7 +1684,7 @@ subscribe_node(Host, Node, From, JID) ->
|
||||||
%%<li>The request specifies a subscription ID that is not valid or current.</li>
|
%%<li>The request specifies a subscription ID that is not valid or current.</li>
|
||||||
%%</ul>
|
%%</ul>
|
||||||
unsubscribe_node(Host, Node, From, JID, SubId) when is_list(JID) ->
|
unsubscribe_node(Host, Node, From, JID, SubId) when is_list(JID) ->
|
||||||
Subscriber = try jlib:short_prepd_jid(exmpp_jid:parse_jid(JID))
|
Subscriber = try jlib:short_prepd_jid(exmpp_jid:parse(JID))
|
||||||
catch
|
catch
|
||||||
_:_ ->
|
_:_ ->
|
||||||
{undefined, undefined, undefined}
|
{undefined, undefined, undefined}
|
||||||
|
@ -2126,7 +2126,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
|
||||||
case El of
|
case El of
|
||||||
#xmlel{name = 'affiliation', attrs = Attrs} ->
|
#xmlel{name = 'affiliation', attrs = Attrs} ->
|
||||||
JID = try
|
JID = try
|
||||||
exmpp_jid:parse_jid(
|
exmpp_jid:parse(
|
||||||
exmpp_xml:get_attribute_from_list_as_list(Attrs, 'jid', ""))
|
exmpp_xml:get_attribute_from_list_as_list(Attrs, 'jid', ""))
|
||||||
catch
|
catch
|
||||||
_:_ -> error
|
_:_ -> error
|
||||||
|
@ -2297,7 +2297,7 @@ set_subscriptions(Host, Node, From, EntitiesEls) ->
|
||||||
case El of
|
case El of
|
||||||
#xmlel{name = 'subscription', attrs = Attrs} ->
|
#xmlel{name = 'subscription', attrs = Attrs} ->
|
||||||
JID = try
|
JID = try
|
||||||
exmpp_jid:parse_jid(
|
exmpp_jid:parse(
|
||||||
exmpp_xml:get_attribute_from_list_as_list(Attrs, 'jid', ""))
|
exmpp_xml:get_attribute_from_list_as_list(Attrs, 'jid', ""))
|
||||||
catch
|
catch
|
||||||
_:_ ->
|
_:_ ->
|
||||||
|
|
|
@ -266,7 +266,7 @@ send_registration_notifications(UJID) ->
|
||||||
lists:foreach(
|
lists:foreach(
|
||||||
fun(S) ->
|
fun(S) ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(S),
|
JID = exmpp_jid:parse(S),
|
||||||
ejabberd_router:route(
|
ejabberd_router:route(
|
||||||
exmpp_jid:make(Host),
|
exmpp_jid:make(Host),
|
||||||
JID,
|
JID,
|
||||||
|
|
|
@ -248,7 +248,7 @@ process_iq_set(From, To, #iq{payload = Request} = IQ_Rec) ->
|
||||||
|
|
||||||
process_item_set(From, To, #xmlel{} = El) ->
|
process_item_set(From, To, #xmlel{} = El) ->
|
||||||
try
|
try
|
||||||
JID1 = exmpp_jid:parse_jid(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
JID1 = exmpp_jid:parse(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
||||||
User = exmpp_jid:node(From),
|
User = exmpp_jid:node(From),
|
||||||
LUser = exmpp_jid:lnode(From),
|
LUser = exmpp_jid:lnode(From),
|
||||||
LServer = exmpp_jid:ldomain(From),
|
LServer = exmpp_jid:ldomain(From),
|
||||||
|
@ -777,7 +777,7 @@ set_items(User, Server, #xmlel{children = Els})
|
||||||
|
|
||||||
process_item_set_t(LUser, LServer, #xmlel{} = El) ->
|
process_item_set_t(LUser, LServer, #xmlel{} = El) ->
|
||||||
try
|
try
|
||||||
JID1 = exmpp_jid:parse_jid(exmpp_xml:get_attribute_as_list(El, 'jid', <<>>)),
|
JID1 = exmpp_jid:parse(exmpp_xml:get_attribute_as_list(El, 'jid', <<>>)),
|
||||||
JID = jlib:short_jid(JID1),
|
JID = jlib:short_jid(JID1),
|
||||||
LJID = jlib:short_prepd_jid(JID1),
|
LJID = jlib:short_prepd_jid(JID1),
|
||||||
Item = #roster{usj = {LUser, LServer, LJID},
|
Item = #roster{usj = {LUser, LServer, LJID},
|
||||||
|
@ -1216,7 +1216,7 @@ user_roster_parse_query(User, Server, Items, Query) ->
|
||||||
error;
|
error;
|
||||||
{value, {_, SJID}} ->
|
{value, {_, SJID}} ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(SJID),
|
JID = exmpp_jid:parse(SJID),
|
||||||
user_roster_subscribe_jid(User, Server, JID),
|
user_roster_subscribe_jid(User, Server, JID),
|
||||||
ok
|
ok
|
||||||
catch
|
catch
|
||||||
|
|
|
@ -216,7 +216,7 @@ process_iq_set(From, To, #iq{payload = Request} = IQ_Rec) ->
|
||||||
|
|
||||||
process_item_set(From, To, #xmlel{} = El) ->
|
process_item_set(From, To, #xmlel{} = El) ->
|
||||||
try
|
try
|
||||||
JID1 = exmpp_jid:parse_jid(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
JID1 = exmpp_jid:parse(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
||||||
User = exmpp_jid:lnode(From),
|
User = exmpp_jid:lnode(From),
|
||||||
Server = exmpp_jid:ldomain(From),
|
Server = exmpp_jid:ldomain(From),
|
||||||
LServer = binary_to_list(Server),
|
LServer = binary_to_list(Server),
|
||||||
|
@ -696,7 +696,7 @@ set_items(User, Server, #xmlel{children = Els}) when is_binary(User), is_binary(
|
||||||
|
|
||||||
process_item_set_t(LUser, LServer, #xmlel{} = El) ->
|
process_item_set_t(LUser, LServer, #xmlel{} = El) ->
|
||||||
try
|
try
|
||||||
JID1 = exmpp_jid:parse_jid(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
JID1 = exmpp_jid:parse(exmpp_xml:get_attribute_as_binary(El, 'jid', <<>>)),
|
||||||
{U0, S0, R0} = LJID = jlib:short_prepd_jid(JID1),
|
{U0, S0, R0} = LJID = jlib:short_prepd_jid(JID1),
|
||||||
Username = ejabberd_odbc:escape(LUser),
|
Username = ejabberd_odbc:escape(LUser),
|
||||||
SJID = ejabberd_odbc:escape(exmpp_jid:jid_to_binary(U0, S0, R0)),
|
SJID = ejabberd_odbc:escape(exmpp_jid:jid_to_binary(U0, S0, R0)),
|
||||||
|
@ -854,7 +854,7 @@ get_jid_info(_, User, Server, JID) when is_binary(User), is_binary(Server) ->
|
||||||
raw_to_record(LServer, {User, SJID, Nick, SSubscription, SAsk, SAskMessage,
|
raw_to_record(LServer, {User, SJID, Nick, SSubscription, SAsk, SAskMessage,
|
||||||
_SServer, _SSubscribe, _SType}) when is_binary(LServer) ->
|
_SServer, _SSubscribe, _SType}) when is_binary(LServer) ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(SJID),
|
JID = exmpp_jid:parse(SJID),
|
||||||
LJID = jlib:short_prepd_jid(JID),
|
LJID = jlib:short_prepd_jid(JID),
|
||||||
Subscription = case SSubscription of
|
Subscription = case SSubscription of
|
||||||
"B" -> both;
|
"B" -> both;
|
||||||
|
@ -1045,7 +1045,7 @@ user_roster_parse_query(User, Server, Items, Query) ->
|
||||||
error;
|
error;
|
||||||
{value, {_, SJID}} ->
|
{value, {_, SJID}} ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(SJID),
|
JID = exmpp_jid:parse(SJID),
|
||||||
user_roster_subscribe_jid(User, Server, JID),
|
user_roster_subscribe_jid(User, Server, JID),
|
||||||
ok
|
ok
|
||||||
catch
|
catch
|
||||||
|
|
|
@ -940,7 +940,7 @@ shared_roster_group_parse_query(Host, Group, Query) ->
|
||||||
USs;
|
USs;
|
||||||
_ ->
|
_ ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(SJID),
|
JID = exmpp_jid:parse(SJID),
|
||||||
[{exmpp_jid:lnode_as_list(JID), exmpp_jid:ldomain_as_list(JID)} | USs]
|
[{exmpp_jid:lnode_as_list(JID), exmpp_jid:ldomain_as_list(JID)} | USs]
|
||||||
catch
|
catch
|
||||||
_ ->
|
_ ->
|
||||||
|
|
|
@ -425,12 +425,12 @@ get_jid("from", ParsedPacket) ->
|
||||||
undefined ->
|
undefined ->
|
||||||
exmpp_jid:make();
|
exmpp_jid:make();
|
||||||
From ->
|
From ->
|
||||||
exmpp_jid:parse_jid(From)
|
exmpp_jid:parse(From)
|
||||||
end;
|
end;
|
||||||
get_jid("to", ParsedPacket) ->
|
get_jid("to", ParsedPacket) ->
|
||||||
case exmpp_stanza:get_recipient(ParsedPacket) of
|
case exmpp_stanza:get_recipient(ParsedPacket) of
|
||||||
undefined ->
|
undefined ->
|
||||||
exmpp_jid:make();
|
exmpp_jid:make();
|
||||||
From ->
|
From ->
|
||||||
exmpp_jid:parse_jid(From)
|
exmpp_jid:parse(From)
|
||||||
end.
|
end.
|
||||||
|
|
|
@ -120,7 +120,7 @@ get_auth(Auth) ->
|
||||||
case Auth of
|
case Auth of
|
||||||
{SJID, P} ->
|
{SJID, P} ->
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(SJID),
|
JID = exmpp_jid:parse(SJID),
|
||||||
U = exmpp_jid:node_as_list(JID),
|
U = exmpp_jid:node_as_list(JID),
|
||||||
S = exmpp_jid:domain_as_list(JID),
|
S = exmpp_jid:domain_as_list(JID),
|
||||||
case ejabberd_auth:check_password(U, S, P) of
|
case ejabberd_auth:check_password(U, S, P) of
|
||||||
|
@ -1176,7 +1176,7 @@ string_to_spec("user_regexp", Val) ->
|
||||||
string_to_spec("server_regexp", Val) ->
|
string_to_spec("server_regexp", Val) ->
|
||||||
{server_regexp, Val};
|
{server_regexp, Val};
|
||||||
string_to_spec("node_regexp", Val) ->
|
string_to_spec("node_regexp", Val) ->
|
||||||
JID = exmpp_jid:parse_jid(Val),
|
JID = exmpp_jid:parse(Val),
|
||||||
U = exmpp_jid:lnode_as_list(JID),
|
U = exmpp_jid:lnode_as_list(JID),
|
||||||
S = exmpp_jid:ldomain_as_list(JID),
|
S = exmpp_jid:ldomain_as_list(JID),
|
||||||
undefined = exmpp_jid:resource(JID),
|
undefined = exmpp_jid:resource(JID),
|
||||||
|
@ -1186,7 +1186,7 @@ string_to_spec("user_glob", Val) ->
|
||||||
string_to_spec("server_glob", Val) ->
|
string_to_spec("server_glob", Val) ->
|
||||||
{server_glob, Val};
|
{server_glob, Val};
|
||||||
string_to_spec("node_glob", Val) ->
|
string_to_spec("node_glob", Val) ->
|
||||||
JID = exmpp_jid:parse_jid(Val),
|
JID = exmpp_jid:parse(Val),
|
||||||
U = exmpp_jid:lnode_as_list(JID),
|
U = exmpp_jid:lnode_as_list(JID),
|
||||||
S = exmpp_jid:ldomain_as_list(JID),
|
S = exmpp_jid:ldomain_as_list(JID),
|
||||||
undefined = exmpp_jid:resource(JID),
|
undefined = exmpp_jid:resource(JID),
|
||||||
|
@ -1199,7 +1199,7 @@ string_to_spec("raw", Val) ->
|
||||||
NewSpec.
|
NewSpec.
|
||||||
|
|
||||||
string_to_spec2(ACLName, Val) ->
|
string_to_spec2(ACLName, Val) ->
|
||||||
JID = exmpp_jid:parse_jid(Val),
|
JID = exmpp_jid:parse(Val),
|
||||||
U = exmpp_jid:lnode_as_list(JID),
|
U = exmpp_jid:lnode_as_list(JID),
|
||||||
S = exmpp_jid:ldomain_as_list(JID),
|
S = exmpp_jid:ldomain_as_list(JID),
|
||||||
undefined = exmpp_jid:resource(JID),
|
undefined = exmpp_jid:resource(JID),
|
||||||
|
@ -1402,7 +1402,7 @@ list_users_parse_query(Query, Host) ->
|
||||||
{value, {_, Password}} =
|
{value, {_, Password}} =
|
||||||
lists:keysearch("newuserpassword", 1, Query),
|
lists:keysearch("newuserpassword", 1, Query),
|
||||||
try
|
try
|
||||||
JID = exmpp_jid:parse_jid(Username++"@"++Host),
|
JID = exmpp_jid:parse(Username++"@"++Host),
|
||||||
User = exmpp_jid:node_as_list(JID),
|
User = exmpp_jid:node_as_list(JID),
|
||||||
Server = exmpp_jid:domain_as_list(JID),
|
Server = exmpp_jid:domain_as_list(JID),
|
||||||
case ejabberd_auth:try_register(User, Server, Password) of
|
case ejabberd_auth:try_register(User, Server, Password) of
|
||||||
|
|
Loading…
Reference in New Issue
Block a user