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

API renaming : parse_jid -> parse 

SVN Revision: 2122
This commit is contained in:
Karim Gemayel 2009-06-01 16:35:55 +00:00
parent a136192db2
commit 526dc54173
21 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ejabberd_c2s.erl
View File

@ -840,7 +840,7 @@ session_established2(El, StateData) ->
undefined ->
exmpp_jid:bare(StateData#state.jid);
_ ->
exmpp_jid:parse_jid(To)
exmpp_jid:parse(To)
end,
NewEl = case exmpp_stanza:get_lang(El) of
undefined ->
@ -1919,7 +1919,7 @@ check_from(El, FromJID) ->
El;
{value, SJID} ->
try
JIDEl = exmpp_jid:parse_jid(SJID),
JIDEl = exmpp_jid:parse(SJID),
case exmpp_jid:lresource(JIDEl) of
undefined ->
%% Matching JID: The stanza is ok

10
src/ejabberd_s2s_in.erl
View File

@ -371,7 +371,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
error;
F ->
try
exmpp_jid:parse_jid(F)
exmpp_jid:parse(F)
catch
_Exception1 -> error
end
@ -381,7 +381,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
error;
T ->
try
exmpp_jid:parse_jid(T)
exmpp_jid:parse(T)
catch
_Exception2 -> error
end
@ -641,7 +641,7 @@ get_cert_domains(Cert) ->
end,
if
D /= error ->
JID = exmpp_jid:parse_jid(D),
JID = exmpp_jid:parse(D),
case {exmpp_jid:lnode_as_list(JID),
exmpp_jid:ldomain_as_list(JID),
exmpp_jid:lresource_as_list(JID)} of
@ -677,7 +677,7 @@ get_cert_domains(Cert) ->
case 'XmppAddr':decode(
'XmppAddr', XmppAddr) of
{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),
exmpp_jid:ldomain_as_list(JID2),
exmpp_jid:lresource_as_list(JID2)} of
@ -695,7 +695,7 @@ get_cert_domains(Cert) ->
[]
end;
({dNSName, D}) when is_list(D) ->
JID3 = exmpp_jid:parse_jid(D),
JID3 = exmpp_jid:parse(D),
case {exmpp_jid:lnode_as_list(JID3),
exmpp_jid:ldomain_as_list(JID3),
exmpp_jid:lresource_as_list(JID3)} of

4
src/ejabberd_s2s_out.erl
View File

@ -855,8 +855,8 @@ bounce_element(El, Condition) ->
<<"result">> -> ok;
_ ->
Err = exmpp_stanza:reply_with_error(El, Condition),
From = exmpp_jid:parse_jid(exmpp_stanza:get_sender(El)),
To = exmpp_jid:parse_jid(exmpp_stanza:get_recipient(El)),
From = exmpp_jid:parse(exmpp_stanza:get_sender(El)),
To = exmpp_jid:parse(exmpp_stanza:get_recipient(El)),
% No namespace conversion (:server <-> :client) is done.
% This is handled by C2S and S2S send_element functions.
ejabberd_router:route(To, From, Err)

6
src/ejabberd_service.erl
View File

@ -227,10 +227,10 @@ stream_established({xmlstreamelement, El}, StateData) ->
%% when accept packets from any address.
%% In this case, the component can send packet of
%% 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
_ ->
FromJID1 = exmpp_jid:parse_jid(From),
FromJID1 = exmpp_jid:parse(From),
Server = exmpp_jid:ldomain(FromJID1),
case lists:member(Server, StateData#state.hosts) of
true -> FromJID1;
@ -240,7 +240,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
To = exmpp_stanza:get_recipient(El),
ToJID = case To of
undefined -> error;
_ -> exmpp_jid:parse_jid(To)
_ -> exmpp_jid:parse(To)
end,
if ((El#xmlel.name == 'iq') or
(El#xmlel.name == 'message') or

4
src/ejabberd_system_monitor.erl
View File

@ -194,7 +194,7 @@ process_large_heap(Pid, Info) ->
lists:foreach(
fun(S) ->
try
JID = exmpp_jid:parse_jid(S),
JID = exmpp_jid:parse(S),
send_message(From, JID, Body)
catch
_ ->
@ -216,7 +216,7 @@ get_admin_jids() ->
lists:flatmap(
fun(S) ->
try
JID = exmpp_jid:parse_jid(S),
JID = exmpp_jid:parse(S),
[{exmpp_jid:lnode(JID),
exmpp_jid:ldomain(JID),
exmpp_jid:lresource(JID)}]

2
src/jd2ejd.erl
View File

@ -195,7 +195,7 @@ process_offline(Server, To, #xmlel{children = Els}) ->
exmpp_jid:make(Server);
_ ->
try
exmpp_jid:parse_jid(FromS)
exmpp_jid:parse(FromS)
catch
_ ->
error

14
src/mod_configure.erl
View File

@ -1562,7 +1562,7 @@ set_form(From, Host, ?NS_ADMINL("add-user"), _Lang, XData) ->
AccountString = get_value("accountjid", XData),
Password = get_value("password", 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),
Server = exmpp_jid:ldomain_as_list(AccountJID),
true = lists:member(Server, ?MYHOSTS),
@ -1575,7 +1575,7 @@ set_form(From, Host, ?NS_ADMINL("delete-user"), _Lang, XData) ->
[_|_] = AccountStringList,
ASL2 = lists:map(
fun(AccountString) ->
JID = exmpp_jid:parse_jid(AccountString),
JID = exmpp_jid:parse(AccountString),
User = [_|_] = exmpp_jid:lnode_as_list(JID),
Server = exmpp_jid:ldomain_as_list(JID),
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) ->
AccountString = get_value("accountjid", XData),
JID = exmpp_jid:parse_jid(AccountString),
JID = exmpp_jid:parse(AccountString),
LUser = [_|_] = exmpp_jid:lnode_as_list(JID),
LServer = exmpp_jid:ldomain_as_list(JID),
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) ->
AccountString = get_value("accountjid", XData),
JID = exmpp_jid:parse_jid(AccountString),
JID = exmpp_jid:parse(AccountString),
User = [_|_] = exmpp_jid:lnode_as_list(JID),
Server = exmpp_jid:ldomain_as_list(JID),
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) ->
AccountString = get_value("accountjid", XData),
Password = get_value("password", XData),
JID = exmpp_jid:parse_jid(AccountString),
JID = exmpp_jid:parse(AccountString),
User = [_|_] = exmpp_jid:lnode_as_list(JID),
Server = exmpp_jid:ldomain_as_list(JID),
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) ->
AccountString = get_value("accountjid", XData),
JID = exmpp_jid:parse_jid(AccountString),
JID = exmpp_jid:parse(AccountString),
User = [_|_] = exmpp_jid:lnode_as_list(JID),
Server = exmpp_jid:ldomain_as_list(JID),
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) ->
AccountString = get_value("accountjid", XData),
JID = exmpp_jid:parse_jid(AccountString),
JID = exmpp_jid:parse(AccountString),
User = [_|_] = exmpp_jid:lnode_as_list(JID),
Server = exmpp_jid:ldomain_as_list(JID),
true = (Server == Host) orelse (get_permission_level(From) == global),

4
src/mod_irc/mod_irc_connection.erl
View File

@ -632,8 +632,8 @@ bounce_messages(Reason) ->
attrs = [?XMLATTR('code', <<"502">>)],
children = [#xmlcdata{cdata = Reason}]},
Err = exmpp_stanza:reply_with_error(El, Error),
From = exmpp_jid:parse_jid(exmpp_stanza:get_sender(El)),
To = exmpp_jid:parse_jid(exmpp_stanza:get_recipient(El)),
From = exmpp_jid:parse(exmpp_stanza:get_sender(El)),
To = exmpp_jid:parse(exmpp_stanza:get_recipient(El)),
ejabberd_router:route(To, From, Err)
end,
bounce_messages(Reason)

2
src/mod_muc/mod_muc_log.erl
View File

@ -271,7 +271,7 @@ build_filename_string(TimeStamp, OutDir, RoomJID, DirType, DirName, FileFormat)
{Fd, Fn, Fnrel}.
get_room_name(RoomJID) ->
JID = exmpp_jid:parse_jid(RoomJID),
JID = exmpp_jid:parse(RoomJID),
exmpp_jid:node_as_list(JID).
%% calculate day before

6
src/mod_muc/mod_muc_room.erl
View File

@ -2294,7 +2294,7 @@ find_changed_items(UJID, UAffiliation, URole,
Lang, StateData, Res) ->
TJID = case exmpp_xml:get_attribute_as_binary(Item, 'jid',false) of
S when S =/= false ->
try exmpp_jid:parse_jid(S) of
try exmpp_jid:parse(S) of
J ->
{value, J}
catch
@ -3344,7 +3344,7 @@ check_invitation(From, Els, Lang, StateData) ->
_ ->
throw({error, 'bad-request'})
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',
false)) of
JID1 -> JID1
@ -3447,7 +3447,7 @@ check_decline_invitation(Packet) ->
#xmlel{ns = ?NS_MUC_USER} = XEl = exmpp_xml:get_element(Packet, 'x'),
DEl = exmpp_xml:get_element(XEl, 'decline'),
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}}.
%% Send the decline to the inviter user.

4
src/mod_offline_odbc.erl
View File

@ -257,9 +257,9 @@ pop_offline_messages(Ls, User, Server)
[El] = exmpp_xml:parse_document(XML,
[names_as_atom, {check_elems, xmpp},
{check_nss,xmpp}, {check_attrs,xmpp}]),
To = exmpp_jid:parse_jid(
To = exmpp_jid:parse(
exmpp_stanza:get_recipient(El)),
From = exmpp_jid:parse_jid(
From = exmpp_jid:parse(
exmpp_stanza:get_sender(El)),
[{route, From, To, El}]
catch

2
src/mod_privacy.erl
View File

@ -444,7 +444,7 @@ parse_items([El = #xmlel{name = item} | Els], Res) ->
case T of
"jid" ->
try
JID = exmpp_jid:parse_jid(V),
JID = exmpp_jid:parse(V),
I1#listitem{
type = jid,
value = jlib:short_prepd_jid(JID)}

4
src/mod_privacy_odbc.erl
View File

@ -445,7 +445,7 @@ parse_items([El = #xmlel{name = item} | Els], Res) ->
case T of
"jid" ->
try
JID = exmpp_jid:parse_jid(V),
JID = exmpp_jid:parse(V),
I1#listitem{
type = jid,
value = jlib:short_prepd_jid(JID)}
@ -693,7 +693,7 @@ raw_to_item({SType, SValue, SAction, SOrder, SMatchAll, SMatchIQ,
"n" ->
{none, none};
"j" ->
JID = exmpp_jid:parse_jid(SValue),
JID = exmpp_jid:parse(SValue),
{jid, jlib:short_prepd_jid(JID)};
"g" ->
{group, SValue};

2
src/mod_proxy65/mod_proxy65_service.erl
View File

@ -160,7 +160,7 @@ process_iq(InitiatorJID, #iq{type = set, payload = SubEl, ns = ?NS_BYTESTREAMS}
allow ->
ActivateEl = exmpp_xml:get_path(SubEl, [{element, 'activate'}]),
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 /= "",
length(SID) =< 128, TargetJID /= InitiatorJID ->
Target = exmpp_jid:prepd_jid_to_list(TargetJID),

10
src/mod_pubsub/mod_pubsub.erl
View File

@ -1310,7 +1310,7 @@ handle_authorization_response(Host, From, To, Packet, XFields) ->
{_, _, _} -> [SNode];
_ -> string:tokens(SNode, "/")
end,
Subscriber = exmpp_jid:parse_jid(SSubscriber),
Subscriber = exmpp_jid:parse(SSubscriber),
Allow = case SAllow of
"1" -> true;
"true" -> true;
@ -1587,7 +1587,7 @@ delete_node(Host, Node, Owner) ->
%%</ul>
subscribe_node(Host, Node, From, JID) ->
Subscriber = try
jlib:short_prepd_jid(exmpp_jid:parse_jid(JID))
jlib:short_prepd_jid(exmpp_jid:parse(JID))
catch
_:_ ->
{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>
%%</ul>
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
_:_ ->
{undefined, undefined, undefined}
@ -2126,7 +2126,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
case El of
#xmlel{name = 'affiliation', attrs = Attrs} ->
JID = try
exmpp_jid:parse_jid(
exmpp_jid:parse(
exmpp_xml:get_attribute_from_list_as_list(Attrs, 'jid', ""))
catch
_:_ -> error
@ -2297,7 +2297,7 @@ set_subscriptions(Host, Node, From, EntitiesEls) ->
case El of
#xmlel{name = 'subscription', attrs = Attrs} ->
JID = try
exmpp_jid:parse_jid(
exmpp_jid:parse(
exmpp_xml:get_attribute_from_list_as_list(Attrs, 'jid', ""))
catch
_:_ ->

2
src/mod_register.erl
View File

@ -266,7 +266,7 @@ send_registration_notifications(UJID) ->
lists:foreach(
fun(S) ->
try
JID = exmpp_jid:parse_jid(S),
JID = exmpp_jid:parse(S),
ejabberd_router:route(
exmpp_jid:make(Host),
JID,

6
src/mod_roster.erl
View File

@ -248,7 +248,7 @@ process_iq_set(From, To, #iq{payload = Request} = IQ_Rec) ->
process_item_set(From, To, #xmlel{} = El) ->
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),
LUser = exmpp_jid:lnode(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) ->
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),
LJID = jlib:short_prepd_jid(JID1),
Item = #roster{usj = {LUser, LServer, LJID},
@ -1216,7 +1216,7 @@ user_roster_parse_query(User, Server, Items, Query) ->
error;
{value, {_, SJID}} ->
try
JID = exmpp_jid:parse_jid(SJID),
JID = exmpp_jid:parse(SJID),
user_roster_subscribe_jid(User, Server, JID),
ok
catch

8
src/mod_roster_odbc.erl
View File

@ -216,7 +216,7 @@ process_iq_set(From, To, #iq{payload = Request} = IQ_Rec) ->
process_item_set(From, To, #xmlel{} = El) ->
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),
Server = exmpp_jid:ldomain(From),
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) ->
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),
Username = ejabberd_odbc:escape(LUser),
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,
_SServer, _SSubscribe, _SType}) when is_binary(LServer) ->
try
JID = exmpp_jid:parse_jid(SJID),
JID = exmpp_jid:parse(SJID),
LJID = jlib:short_prepd_jid(JID),
Subscription = case SSubscription of
"B" -> both;
@ -1045,7 +1045,7 @@ user_roster_parse_query(User, Server, Items, Query) ->
error;
{value, {_, SJID}} ->
try
JID = exmpp_jid:parse_jid(SJID),
JID = exmpp_jid:parse(SJID),
user_roster_subscribe_jid(User, Server, JID),
ok
catch

2
src/mod_shared_roster.erl
View File

@ -940,7 +940,7 @@ shared_roster_group_parse_query(Host, Group, Query) ->
USs;
_ ->
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]
catch
_ ->

4
src/web/ejabberd_http_poll.erl
View File

@ -425,12 +425,12 @@ get_jid("from", ParsedPacket) ->
undefined ->
exmpp_jid:make();
From ->
exmpp_jid:parse_jid(From)
exmpp_jid:parse(From)
end;
get_jid("to", ParsedPacket) ->
case exmpp_stanza:get_recipient(ParsedPacket) of
undefined ->
exmpp_jid:make();
From ->
exmpp_jid:parse_jid(From)
exmpp_jid:parse(From)
end.

10
src/web/ejabberd_web_admin.erl
View File

@ -120,7 +120,7 @@ get_auth(Auth) ->
case Auth of
{SJID, P} ->
try
JID = exmpp_jid:parse_jid(SJID),
JID = exmpp_jid:parse(SJID),
U = exmpp_jid:node_as_list(JID),
S = exmpp_jid:domain_as_list(JID),
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) ->
{server_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),
S = exmpp_jid:ldomain_as_list(JID),
undefined = exmpp_jid:resource(JID),
@ -1186,7 +1186,7 @@ string_to_spec("user_glob", Val) ->
string_to_spec("server_glob", Val) ->
{server_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),
S = exmpp_jid:ldomain_as_list(JID),
undefined = exmpp_jid:resource(JID),
@ -1199,7 +1199,7 @@ string_to_spec("raw", Val) ->
NewSpec.
string_to_spec2(ACLName, Val) ->
JID = exmpp_jid:parse_jid(Val),
JID = exmpp_jid:parse(Val),
U = exmpp_jid:lnode_as_list(JID),
S = exmpp_jid:ldomain_as_list(JID),
undefined = exmpp_jid:resource(JID),
@ -1402,7 +1402,7 @@ list_users_parse_query(Query, Host) ->
{value, {_, Password}} =
lists:keysearch("newuserpassword", 1, Query),
try
JID = exmpp_jid:parse_jid(Username++"@"++Host),
JID = exmpp_jid:parse(Username++"@"++Host),
User = exmpp_jid:node_as_list(JID),
Server = exmpp_jid:domain_as_list(JID),
case ejabberd_auth:try_register(User, Server, Password) of