mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-26 17:38:45 +01:00
API renaming : lresource_as_list -> prep_resource_as_list
SVN Revision: 2128
This commit is contained in:
parent
29c0e17ca2
commit
4258b99b2b
@ -233,7 +233,7 @@ match_acl(ACLName, JID, Host) ->
|
|||||||
_ ->
|
_ ->
|
||||||
User = exmpp_jid:prep_node_as_list(JID),
|
User = exmpp_jid:prep_node_as_list(JID),
|
||||||
Server = exmpp_jid:prep_domain_as_list(JID),
|
Server = exmpp_jid:prep_domain_as_list(JID),
|
||||||
Resource = exmpp_jid:lresource_as_list(JID),
|
Resource = exmpp_jid:prep_resource_as_list(JID),
|
||||||
lists:any(fun(#acl{aclspec = Spec}) ->
|
lists:any(fun(#acl{aclspec = Spec}) ->
|
||||||
case Spec of
|
case Spec of
|
||||||
all ->
|
all ->
|
||||||
|
@ -644,7 +644,7 @@ get_cert_domains(Cert) ->
|
|||||||
JID = exmpp_jid:parse(D),
|
JID = exmpp_jid:parse(D),
|
||||||
case {exmpp_jid:prep_node_as_list(JID),
|
case {exmpp_jid:prep_node_as_list(JID),
|
||||||
exmpp_jid:prep_domain_as_list(JID),
|
exmpp_jid:prep_domain_as_list(JID),
|
||||||
exmpp_jid:lresource_as_list(JID)} of
|
exmpp_jid:prep_resource_as_list(JID)} of
|
||||||
{undefined, LD, undefined} ->
|
{undefined, LD, undefined} ->
|
||||||
[LD];
|
[LD];
|
||||||
_ ->
|
_ ->
|
||||||
@ -680,7 +680,7 @@ get_cert_domains(Cert) ->
|
|||||||
JID2 = exmpp_jid:parse(binary_to_list(D)),
|
JID2 = exmpp_jid:parse(binary_to_list(D)),
|
||||||
case {exmpp_jid:prep_node_as_list(JID2),
|
case {exmpp_jid:prep_node_as_list(JID2),
|
||||||
exmpp_jid:prep_domain_as_list(JID2),
|
exmpp_jid:prep_domain_as_list(JID2),
|
||||||
exmpp_jid:lresource_as_list(JID2)} of
|
exmpp_jid:prep_resource_as_list(JID2)} of
|
||||||
{ undefined, LD, undefined} ->
|
{ undefined, LD, undefined} ->
|
||||||
case idna:domain_utf8_to_ascii(LD) of
|
case idna:domain_utf8_to_ascii(LD) of
|
||||||
false ->
|
false ->
|
||||||
@ -698,7 +698,7 @@ get_cert_domains(Cert) ->
|
|||||||
JID3 = exmpp_jid:parse(D),
|
JID3 = exmpp_jid:parse(D),
|
||||||
case {exmpp_jid:prep_node_as_list(JID3),
|
case {exmpp_jid:prep_node_as_list(JID3),
|
||||||
exmpp_jid:prep_domain_as_list(JID3),
|
exmpp_jid:prep_domain_as_list(JID3),
|
||||||
exmpp_jid:lresource_as_list(JID3)} of
|
exmpp_jid:prep_resource_as_list(JID3)} of
|
||||||
{undefined, LD, undefined} ->
|
{undefined, LD, undefined} ->
|
||||||
[LD];
|
[LD];
|
||||||
_ ->
|
_ ->
|
||||||
|
@ -1593,7 +1593,7 @@ set_form(From, Host, ?NS_ADMINL("end-user-session"), _Lang, XData) ->
|
|||||||
LServer = exmpp_jid:prep_domain_as_list(JID),
|
LServer = exmpp_jid:prep_domain_as_list(JID),
|
||||||
true = (LServer == Host) orelse (get_permission_level(From) == global),
|
true = (LServer == Host) orelse (get_permission_level(From) == global),
|
||||||
%% Code copied from ejabberd_sm.erl
|
%% Code copied from ejabberd_sm.erl
|
||||||
case exmpp_jid:lresource_as_list(JID) of
|
case exmpp_jid:prep_resource_as_list(JID) of
|
||||||
undefined ->
|
undefined ->
|
||||||
SIDs = mnesia:dirty_select(session,
|
SIDs = mnesia:dirty_select(session,
|
||||||
[{#session{sid = '$1', usr = {LUser, LServer, '_'}, _ = '_'}, [], ['$1']}]),
|
[{#session{sid = '$1', usr = {LUser, LServer, '_'}, _ = '_'}, [], ['$1']}]),
|
||||||
|
@ -89,7 +89,7 @@ unauthenticated_iq_register(Acc, _Server, _IQ, _IP) ->
|
|||||||
process_iq(From, To, IQ) ->
|
process_iq(From, To, IQ) ->
|
||||||
process_iq(From, To, IQ, {exmpp_jid:prep_node_as_list(From),
|
process_iq(From, To, IQ, {exmpp_jid:prep_node_as_list(From),
|
||||||
exmpp_jid:prep_domain_as_list(From),
|
exmpp_jid:prep_domain_as_list(From),
|
||||||
exmpp_jid:lresource_as_list(From)}).
|
exmpp_jid:prep_resource_as_list(From)}).
|
||||||
|
|
||||||
process_iq(From, To,
|
process_iq(From, To,
|
||||||
#iq{type = Type, lang = Lang, payload = SubEl} = IQ_Rec,
|
#iq{type = Type, lang = Lang, payload = SubEl} = IQ_Rec,
|
||||||
|
Loading…
Reference in New Issue
Block a user