Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Fid mod_roster_odbc binary arguments

Browse Source
This commit is contained in:
Badlop 2010-06-18 17:01:24 +02:00
parent fe4944e031
commit 19ad0eb238
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mod_roster_odbc.erl
View File

@ -760,10 +760,11 @@ in_auto_reply(_, _, _) -> none.
remove_user(User, Server) when is_binary(User), is_binary(Server) -> remove_user(User, Server) when is_binary(User), is_binary(Server) ->
try try
LUser = exmpp_stringprep:nodeprep(User), LUser = exmpp_stringprep:nodeprep(User),
LServer = binary_to_list(exmpp_stringprep:nameprep(Server)), LServer = exmpp_stringprep:nameprep(Server),
LServerStr = binary_to_list(LServer),
Username = ejabberd_odbc:escape(LUser), Username = ejabberd_odbc:escape(LUser),
send_unsubscription_to_rosteritems(LUser, LServer), send_unsubscription_to_rosteritems(LUser, LServer),
odbc_queries:del_user_roster_t(LServer, Username), odbc_queries:del_user_roster_t(LServerStr, Username),
ok ok
catch catch
_ -> _ ->
@ -1213,8 +1214,8 @@ user_roster_item_parse_query(User, Server, Items, Query) ->
case lists:keysearch( case lists:keysearch(
"validate" ++ ejabberd_web_admin:term_to_id(JID), 1, Query) of "validate" ++ ejabberd_web_admin:term_to_id(JID), 1, Query) of
{value, _} -> {value, _} ->
{U, S, R} = JID, {U, S, Resource} = JID,
JID1 = exmpp_jid:make(U, S, R), JID1 = exmpp_jid:make(U, S, Resource),
out_subscription( out_subscription(
User, Server, JID1, subscribed), User, Server, JID1, subscribed),
UJID = exmpp_jid:make(User, Server), UJID = exmpp_jid:make(User, Server),