fix nodetree plugin resolver

SVN Revision: 1889

diff --git a/ChangeLog b/ChangeLog
index 42971543c40f5c95aacd696f9bb99a636abd2866..31961973a2ef37786ed3d2a0686f29d2c4a88a81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-19  Christophe Romain <christophe.romain@process-one.net>
+
+       * src/mod_pubsub/mod_pubsub.erl: fix nodetree plugin resolver
+
 2009-02-17  Badlop  <badlop@process-one.net>
 
        * src/ejabberd_listener.erl: More error detections

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index a663d8fded58652980c52589c136700df5083671..f4781b2f3aad0d4334247e3deca6646fa0eb7433 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -33,14 +33,13 @@
 %%% This module uses version 1.12 of the specification as a base.
 %%% Most of the specification is implemented.
 %%% Functions concerning configuration should be rewritten.
-%%% Code is derivated from the original pubsub v1.7, by Alexey Shchepin
 
 %%% TODO
 %%% plugin: generate Reply (do not use broadcast atom anymore)
 
 -module(mod_pubsub).
 -author('christophe.romain@process-one.net').
--version('1.12-01').
+-version('1.12-02').
 
 -behaviour(gen_server).
 -behaviour(gen_mod).
@@ -183,7 +182,7 @@ init([ServerHost, Opts]) ->
     ets:new(gen_mod:get_module_proc(ServerHost, pubsub_state), [set, named_table]),
     ets:insert(gen_mod:get_module_proc(ServerHost, pubsub_state), {nodetree, NodeTree}),
     ets:insert(gen_mod:get_module_proc(ServerHost, pubsub_state), {plugins, Plugins}),
-       ets:insert(gen_mod:get_module_proc(ServerHost, pubsub_state), {pep_mapping, PepMapping}),
+    ets:insert(gen_mod:get_module_proc(ServerHost, pubsub_state), {pep_mapping, PepMapping}),
     init_nodes(Host, ServerHost),
     {ok, #state{host = Host,
                server_host = ServerHost,
@@ -761,10 +760,10 @@ iq_disco_info(Host, SNode, From, Lang) ->
               [{"category", "pubsub"},
                {"type", "service"},
                {"name", translate:translate(Lang, "Publish-Subscribe")}], []},
-             {xmlelement, "feature", [{"var", ?NS_DISCO_INFO}], []},
-             {xmlelement, "feature", [{"var", ?NS_DISCO_ITEMS}], []},
-             {xmlelement, "feature", [{"var", ?NS_PUBSUB}], []},
-             {xmlelement, "feature", [{"var", ?NS_VCARD}], []}] ++
+               {xmlelement, "feature", [{"var", ?NS_DISCO_INFO}], []},
+               {xmlelement, "feature", [{"var", ?NS_DISCO_ITEMS}], []},
+               {xmlelement, "feature", [{"var", ?NS_PUBSUB}], []},
+               {xmlelement, "feature", [{"var", ?NS_VCARD}], []}] ++
             lists:map(fun(Feature) ->
                 {xmlelement, "feature", [{"var", ?NS_PUBSUB++"#"++Feature}], []}
             end, features(Host, SNode))};
@@ -2745,7 +2744,7 @@ tree_call({_User, Server, _Resource}, Function, Args) ->
 tree_call(Host, Function, Args) ->
     Module = case ets:lookup(gen_mod:get_module_proc(Host, pubsub_state), nodetree) of
        [{nodetree, N}] -> N;
-       _ -> list_to_atom(?TREE_PREFIX ++ ?STDNODE)
+       _ -> list_to_atom(?TREE_PREFIX ++ ?STDTREE)
     end,
     catch apply(Module, Function, Args).
 tree_action(Host, Function, Args) ->