From 12d6f3364bc62c71af3df97bde70a22c3bd205d1 Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 15 Jul 2011 02:49:48 +0200 Subject: [PATCH] Support static_modules in mod_blocking, configure, pres_counter, register, shared_roster and sic --- src/mod_blocking.erl | 5 +++-- src/mod_configure.erl | 5 +++-- src/mod_pres_counter.erl | 5 +++-- src/mod_register.erl | 5 +++-- src/mod_shared_roster.erl | 5 +++-- src/mod_sic.erl | 5 +++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl index bcbb12973..447b7396d 100644 --- a/src/mod_blocking.erl +++ b/src/mod_blocking.erl @@ -38,8 +38,9 @@ -include_lib("exmpp/include/exmpp.hrl"). -include("mod_privacy.hrl"). -start(Host, Opts) -> - HostB = list_to_binary(Host), +start(Host, Opts) when is_list(Host) -> + start(list_to_binary(Host), Opts); +start(HostB, Opts) -> IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), ejabberd_hooks:add(privacy_iq_get, HostB, ?MODULE, process_iq_get, 40), diff --git a/src/mod_configure.erl b/src/mod_configure.erl index 4f436649b..3fced95a3 100644 --- a/src/mod_configure.erl +++ b/src/mod_configure.erl @@ -56,8 +56,9 @@ %% Copied from ejabberd_sm.erl -record(session, {sid, usr, us, priority, info}). -start(Host, _Opts) -> - HostB = list_to_binary(Host), +start(Host, Opts) when is_list(Host) -> + start(list_to_binary(Host), Opts); +start(HostB, _Opts) -> ejabberd_hooks:add(disco_local_items, HostB, ?MODULE, get_local_items, 50), ejabberd_hooks:add(disco_local_features, HostB, ?MODULE, get_local_features, 50), ejabberd_hooks:add(disco_local_identity, HostB, ?MODULE, get_local_identity, 50), diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl index c062ef060..75052420d 100644 --- a/src/mod_pres_counter.erl +++ b/src/mod_pres_counter.erl @@ -37,8 +37,9 @@ -record(pres_counter, {dir, start, count, logged = false}). -start(Host, _Opts) -> - HostB = list_to_binary(Host), +start(Host, Opts) when is_list(Host) -> + start(list_to_binary(Host), Opts); +start(HostB, _Opts) -> ejabberd_hooks:add(privacy_check_packet, HostB, ?MODULE, check_packet, 25), ok. diff --git a/src/mod_register.erl b/src/mod_register.erl index e7f51bb31..a5d142b53 100644 --- a/src/mod_register.erl +++ b/src/mod_register.erl @@ -40,8 +40,9 @@ -include("ejabberd.hrl"). -start(Host, Opts) -> - HostB = list_to_binary(Host), +start(Host, Opts) when is_list(Host) -> + start(list_to_binary(Host), Opts); +start(HostB, Opts) -> IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), gen_iq_handler:add_iq_handler(ejabberd_local, HostB, ?NS_INBAND_REGISTER, ?MODULE, process_iq, IQDisc), diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl index 670745c7d..bc9c2fd88 100644 --- a/src/mod_shared_roster.erl +++ b/src/mod_shared_roster.erl @@ -63,8 +63,9 @@ -record(sr_group, {group_host, opts}). -record(sr_user, {us, group_host}). -start(Host, _Opts) -> - HostB = list_to_binary(Host), +start(Host, Opts) when is_list(Host) -> + start(list_to_binary(Host), Opts); +start(HostB, _Opts) -> mnesia:create_table(sr_group, [{disc_copies, [node()]}, {attributes, record_info(fields, sr_group)}]), diff --git a/src/mod_sic.erl b/src/mod_sic.erl index 39c45d87b..86689acb1 100644 --- a/src/mod_sic.erl +++ b/src/mod_sic.erl @@ -38,8 +38,9 @@ -include_lib("exmpp/include/exmpp_jid.hrl"). -include("ejabberd.hrl"). -start(Host, Opts) -> - HostB = list_to_binary(Host), +start(Host, Opts) when is_list(Host) -> + start(list_to_binary(Host), Opts); +start(HostB, Opts) -> IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), mod_disco:register_feature(HostB, ?NS_SIC_0_s), gen_iq_handler:add_iq_handler(ejabberd_local, HostB, ?NS_SIC_0_s,