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

Add missing needdb check in mod_privacy, to enable blocking by group and subscription again.

Browse Source
This commit is contained in:
Andreas Köhler 2010-09-17 16:44:48 +02:00 committed by Badlop
parent e2c3925b7d
commit 3278f019cb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod_privacy.erl
View File

@ -392,12 +392,13 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
{atomic, {error, _} = Error} -> {atomic, {error, _} = Error} ->
Error; Error;
{atomic, {result, _} = Res} -> {atomic, {result, _} = Res} ->
NeedDb = is_list_needdb(List),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(LUser, LServer, ""), jlib:make_jid(LUser, LServer, ""),
jlib:make_jid(LUser, LServer, ""), jlib:make_jid(LUser, LServer, ""),
{xmlelement, "broadcast", [], {xmlelement, "broadcast", [],
[{privacy_list, [{privacy_list,
#userlist{name = Name, list = List}, #userlist{name = Name, list = List, needdb = NeedDb},
Name}]}), Name}]}),
Res; Res;
_ -> _ ->

3
src/mod_privacy_odbc.erl
View File

@ -392,12 +392,13 @@ process_list_set(LUser, LServer, {value, Name}, Els) ->
{atomic, {error, _} = Error} -> {atomic, {error, _} = Error} ->
Error; Error;
{atomic, {result, _} = Res} -> {atomic, {result, _} = Res} ->
NeedDb = is_list_needdb(List),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(LUser, LServer, ""), jlib:make_jid(LUser, LServer, ""),
jlib:make_jid(LUser, LServer, ""), jlib:make_jid(LUser, LServer, ""),
{xmlelement, "broadcast", [], {xmlelement, "broadcast", [],
[{privacy_list, [{privacy_list,
#userlist{name = Name, list = List}, #userlist{name = Name, list = List, needdb = NeedDb},
Name}]}), Name}]}),
Res; Res;
_ -> _ ->