Bugfixes coming from trunk (SVN #599):
* src/mod_shared_roster.erl: Bugfix * src/mod_roster_odbc.erl: Bugfix SVN Revision: 609
This commit is contained in:
parent
647acc7768
commit
6bdabb0c3b
|
@ -1,3 +1,9 @@
|
||||||
|
2006-09-05 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/mod_shared_roster.erl: Bugfix
|
||||||
|
|
||||||
|
* src/mod_roster_odbc.erl: Bugfix
|
||||||
|
|
||||||
2006-09-03 Mickael Remond <mickael.remond@process-one.net>
|
2006-09-03 Mickael Remond <mickael.remond@process-one.net>
|
||||||
|
|
||||||
* src/odbc/odbc_queries.erl: Support for Microsoft SQL Server as a
|
* src/odbc/odbc_queries.erl: Support for Microsoft SQL Server as a
|
||||||
|
|
|
@ -141,11 +141,10 @@ get_user_roster(Acc, {LUser, LServer}) ->
|
||||||
R ->
|
R ->
|
||||||
SJID = jlib:jid_to_string(R#roster.jid),
|
SJID = jlib:jid_to_string(R#roster.jid),
|
||||||
Groups = lists:flatmap(
|
Groups = lists:flatmap(
|
||||||
fun({S, G}) ->
|
fun({S, G}) when S == SJID ->
|
||||||
case jlib:jid_tolower(S) of
|
[G];
|
||||||
SJID -> [G];
|
(_) ->
|
||||||
_ -> []
|
[]
|
||||||
end
|
|
||||||
end, JIDGroups),
|
end, JIDGroups),
|
||||||
[R#roster{groups = Groups}]
|
[R#roster{groups = Groups}]
|
||||||
end
|
end
|
||||||
|
|
|
@ -332,7 +332,8 @@ get_user_displayed_groups(US) ->
|
||||||
[Group || Group <- DisplayedGroups1, is_group_enabled(Host, Group)].
|
[Group || Group <- DisplayedGroups1, is_group_enabled(Host, Group)].
|
||||||
|
|
||||||
is_user_in_group(US, Group, Host) ->
|
is_user_in_group(US, Group, Host) ->
|
||||||
case mnesia:match_object(#sr_user{us=US, group_host={Group, Host}}) of
|
case catch mnesia:dirty_match_object(
|
||||||
|
#sr_user{us=US, group_host={Group, Host}}) of
|
||||||
[] -> false;
|
[] -> false;
|
||||||
_ -> true
|
_ -> true
|
||||||
end.
|
end.
|
||||||
|
|
Loading…
Reference in New Issue