Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

* src/mod_roster_odbc.erl: Bugfix

Browse Source 
SVN Revision: 428
This commit is contained in:
Alexey Shchepin 2005-10-29 20:14:39 +00:00
parent 144f9f09e7
commit a8f5d4cd3d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-10-29 Alexey Shchepin <alexey@sevcom.net>
* src/mod_roster_odbc.erl: Bugfix
2005-10-25 Alexey Shchepin <alexey@sevcom.net> 2005-10-25 Alexey Shchepin <alexey@sevcom.net>
* src/tls/tls.erl: Accept {error,already_loaded} from * src/tls/tls.erl: Accept {error,already_loaded} from

13
src/mod_roster_odbc.erl
View File

@ -468,7 +468,18 @@ process_subscription(Direction, User, Server, JID1, Type) ->
{selected, ["username", "jid", "nick", "subscription", "ask", {selected, ["username", "jid", "nick", "subscription", "ask",
"server", "subscribe", "type"], "server", "subscribe", "type"],
[I]} -> [I]} ->
raw_to_record(I); R = raw_to_record(I),
Groups = case catch ejabberd_odbc:sql_query(
LServer,
["select grp from rostergroups "
"where username='", Username, "' "
"and jid='", SJID, "'"]) of
{selected, ["grp"], JGrps} when is_list(JGrps) ->
[JGrp || {JGrp} <- JGrps];
_ ->
[]
end,
R#roster{groups = Groups};
_ -> _ ->
#roster{user = LUser, #roster{user = LUser,
jid = LJID} jid = LJID}