Minor cosmetic changes on pubsub code

diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index a586935b874a1131eb83c0800d0c45653d23ca3b..a138b1896842560f2c96704048e5e19bd61aad80 100644 (file)
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -251,7 +251,7 @@ init([ServerHost, Opts]) ->
     Host = gen_mod:get_opt_host(ServerHost, Opts, <<"pubsub.@HOST@">>),
     ejabberd_router:register_route(Host, ServerHost),
     Access = gen_mod:get_opt(access_createnode, Opts,
-           fun(A) when is_atom(A) -> A end, all),
+           fun acl:access_rules_validator/1, all),
     PepOffline = gen_mod:get_opt(ignore_pep_from_offline, Opts,
            fun(A) when is_boolean(A) -> A end, true),
     IQDisc = gen_mod:get_opt(iqdisc, Opts,
@@ -262,7 +262,7 @@ init([ServerHost, Opts]) ->
            fun(A) when is_integer(A) andalso A >= 0 -> A end, ?MAXITEMS),
     MaxSubsNode = gen_mod:get_opt(max_subscriptions_node, Opts,
            fun(A) when is_integer(A) andalso A >= 0 -> A end, undefined),
-    pubsub_index:init(Host, ServerHost, Opts),
+    [pubsub_index:init(Host, ServerHost, Opts) || gen_mod:db_type(ServerHost, ?MODULE)==mnesia],
     {Plugins, NodeTree, PepMapping} = init_plugins(Host, ServerHost, Opts),
     DefaultModule = plugin(Host, hd(Plugins)),
     BaseOptions = DefaultModule:options(),
@@ -3899,8 +3899,7 @@ purge_offline(Host, LJID, Node) ->
            Error
     end.
 
-mod_opt_type(access_createnode) ->
-    fun (A) when is_atom(A) -> A end;
+mod_opt_type(access_createnode) -> fun acl:access_rules_validator/1;
 mod_opt_type(db_type) -> fun(T) -> ejabberd_config:v_db(?MODULE, T) end;
 mod_opt_type(host) -> fun iolist_to_binary/1;
 mod_opt_type(ignore_pep_from_offline) ->

diff --git a/src/node_flat.erl b/src/node_flat.erl
index 3afa49f222c5f96fd592f56548c8f53da1f53ab5..9c1bc9b98700af0234cbd8a220d9a2d939dd05e1 100644 (file)
--- a/src/node_flat.erl
+++ b/src/node_flat.erl
@@ -50,7 +50,7 @@
     path_to_node/1, can_fetch_item/2, is_subscribed/1]).
 
 init(_Host, _ServerHost, _Opts) ->
-    %pubsub_subscription:init(),
+    %pubsub_subscription:init(Host, ServerHost, Opts),
     mnesia:create_table(pubsub_state,
        [{disc_copies, [node()]},
            {type, ordered_set},

diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl
index 5adf1e559539d71226ac8f2fd25deeec73ecd0ed..7e5ce788f1d5f039fb06bda6210a48d9d0e9b651 100644 (file)
--- a/src/node_flat_sql.erl
+++ b/src/node_flat_sql.erl
@@ -61,7 +61,7 @@
          encode_host_like/1]).
 
 init(_Host, _ServerHost, _Opts) ->
-    %%pubsub_subscription_sql:init(),
+    %%pubsub_subscription_sql:init(Host, ServerHost, Opts),
     ok.
 
 terminate(_Host, _ServerHost) ->

diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl
index f2c96225733cf86fab673be50dbcc02b8b571585..297c6627c6739b2aa97105d7069d45d75a9ea847 100644 (file)
--- a/src/pubsub_subscription.erl
+++ b/src/pubsub_subscription.erl
@@ -28,7 +28,7 @@
 -author("bjc@kublai.com").
 
 %% API
--export([init/0, subscribe_node/3, unsubscribe_node/3,
+-export([init/3, subscribe_node/3, unsubscribe_node/3,
     get_subscription/3, set_subscription/4,
     make_subid/0,
     get_options_xform/2, parse_options_xform/1]).
@@ -73,7 +73,7 @@
 %%====================================================================
 %% API
 %%====================================================================
-init() -> ok = create_table().
+init(_Host, _ServerHost, _Opts) -> ok = create_table().
 
 subscribe_node(JID, NodeId, Options) ->
     case catch mnesia:sync_dirty(fun add_subscription/3, [JID, NodeId, Options])

diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl
index 922b2a418e7238cd9d845d7e7137020299315303..bb7b6411241ef8e16679f3403c70ad5d89229792 100644 (file)
--- a/src/pubsub_subscription_sql.erl
+++ b/src/pubsub_subscription_sql.erl
@@ -28,7 +28,7 @@
 -author("pablo.polvorin@process-one.net").
 
 %% API
--export([init/0, subscribe_node/3, unsubscribe_node/3,
+-export([init/3, subscribe_node/3, unsubscribe_node/3,
     get_subscription/3, set_subscription/4,
     make_subid/0,
     get_options_xform/2, parse_options_xform/1]).
@@ -71,7 +71,7 @@
 %% API
 %%====================================================================
 
-init() -> ok = create_table().
+init(_Host, _ServerHost, _Opts) -> ok = create_table().
 
 -spec subscribe_node(_JID :: _, _NodeId :: _, Options :: [] | mod_pubsub:subOptions()) ->
                            {result, mod_pubsub:subId()}.