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

populate pubsub#roster_groups_allowed in node configuration options (thanks to Karim Gemayel)(EJAB-1344)

Browse Source
This commit is contained in:
Christophe Romain 2010-11-10 15:14:16 +01:00
parent fbb84c8256
commit 03239c662e
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mod_pubsub/mod_pubsub.erl
View File

@ -52,6 +52,7 @@
-include("ejabberd.hrl"). -include("ejabberd.hrl").
-include("adhoc.hrl"). -include("adhoc.hrl").
-include("pubsub.hrl"). -include("pubsub.hrl").
-include("mod_roster.hrl").
-define(STDTREE, "tree"). -define(STDTREE, "tree").
-define(STDNODE, "flat"). -define(STDNODE, "flat").
@ -3750,13 +3751,25 @@ user_resources(User, Server) ->
%%<li>The service does not support node configuration.</li> %%<li>The service does not support node configuration.</li>
%%<li>The service does not support retrieval of default node configuration.</li> %%<li>The service does not support retrieval of default node configuration.</li>
%%</ul> %%</ul>
get_configure(Host, ServerHost, Node, From, Lang) -> get_configure(Host, ServerHost, Node, #jid{node = User, domain = Server} = From, Lang) ->
ServerHostB = list_to_binary(ServerHost),
Action = Action =
fun(#pubsub_node{options = Options, type = Type, idx = Nidx}) -> fun(#pubsub_node{options = Options, type = Type, idx = Nidx}) ->
case node_call(Type, get_affiliation, [Nidx, From]) of case node_call(Type, get_affiliation, [Nidx, From]) of
{result, owner} -> {result, owner} ->
Groups = ejabberd_hooks:run_fold(roster_groups, ServerHostB, [], [ServerHostB]), Groups = case lists:member(binary_to_list(Server), ?MYHOSTS) of
true ->
%Roster_Items = ejabberd_hooks:run_fold(roster_get, ServerHost, [], [{User,Server}]),
Roster_Groups = lists:foldl(fun
(#roster{groups = []}, Acc) -> Acc;
(#roster{groups = Item_Groups}, Acc) -> [Item_Groups | Acc]
end, [], ejabberd_hooks:run_fold(roster_get, ServerHost, [], [{User,Server}])),
case Roster_Groups of
[[[]]] -> [];
_ -> lists:usort(Roster_Groups)
end;
false ->
[]
end,
{result, {result,
#xmlel{ns = ?NS_PUBSUB_OWNER, name = 'pubsub', children = #xmlel{ns = ?NS_PUBSUB_OWNER, name = 'pubsub', children =
[#xmlel{ns = ?NS_PUBSUB_OWNER, name = 'configure', attrs = [#xmlel{ns = ?NS_PUBSUB_OWNER, name = 'configure', attrs =