diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2015-11-24 18:44:13 +0300 |
| commit | 95265dd3ad8e149d94d08e1a73970fb0bbf55b49 (patch) | |
| tree | a00a134cf0148a121ea505809cef0d9d49799652 /src/mod_shared_roster_ldap.erl | |
| parent | Make Riak working on R18 (diff) | |
Move JID related functions to jid.erl (#847)
Diffstat (limited to 'src/mod_shared_roster_ldap.erl')
| -rw-r--r-- | src/mod_shared_roster_ldap.erl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl index 2a3d8ee11..9064a6711 100644 --- a/src/mod_shared_roster_ldap.erl +++ b/src/mod_shared_roster_ldap.erl @@ -159,8 +159,8 @@ process_item(RosterItem, _Host) -> end. get_subscription_lists({F, T}, User, Server) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), US = {LUser, LServer}, DisplayedGroups = get_user_displayed_groups(US), SRUsers = lists:usort(lists:flatmap(fun (Group) -> @@ -172,10 +172,10 @@ get_subscription_lists({F, T}, User, Server) -> get_jid_info({Subscription, Groups}, User, Server, JID) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), US = {LUser, LServer}, - {U1, S1, _} = jlib:jid_tolower(JID), + {U1, S1, _} = jid:tolower(JID), US1 = {U1, S1}, SRUsers = get_user_to_groups_map(US, false), case dict:find(US1, SRUsers) of @@ -197,11 +197,11 @@ out_subscription(User, Server, JID, Type) -> process_subscription(Direction, User, Server, JID, _Type, Acc) -> - LUser = jlib:nodeprep(User), - LServer = jlib:nameprep(Server), + LUser = jid:nodeprep(User), + LServer = jid:nameprep(Server), US = {LUser, LServer}, {U1, S1, _} = - jlib:jid_tolower(jlib:jid_remove_resource(JID)), + jid:tolower(jid:remove_resource(JID)), US1 = {U1, S1}, DisplayedGroups = get_user_displayed_groups(US), SRUsers = lists:usort(lists:flatmap(fun (Group) -> @@ -417,7 +417,7 @@ search_group_info(State, Group) -> UID}, L) -> PUID = - jlib:nodeprep(UID), + jid:nodeprep(UID), case PUID of |