Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

* src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and

Browse Source 
mod_pubsub has PEP plugin enabled (EJAB-677)

SVN Revision: 1386
This commit is contained in:
Badlop 2008-06-29 11:34:30 +00:00
parent 152efbb112
commit 5e25cbcaa9
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-29 Badlop <badlop@process-one.net>
* src/mod_pubsub/node_pep.erl: Complain if mod_caps disabled and
mod_pubsub has PEP plugin enabled (EJAB-677)
2008-06-28 Badlop <badlop@process-one.net> 2008-06-28 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc_room.erl: Allow to store room * src/mod_muc/mod_muc_room.erl: Allow to store room

24
src/mod_pubsub/node_pep.erl
View File

@ -29,6 +29,7 @@
-module(node_pep). -module(node_pep).
-author('christophe.romain@process-one.net'). -author('christophe.romain@process-one.net').
-include("ejabberd.hrl").
-include("pubsub.hrl"). -include("pubsub.hrl").
-include("jlib.hrl"). -include("jlib.hrl").
@ -65,6 +66,7 @@
init(Host, ServerHost, Opts) -> init(Host, ServerHost, Opts) ->
node_default:init(Host, ServerHost, Opts), node_default:init(Host, ServerHost, Opts),
complain_if_modcaps_disabled(ServerHost),
ok. ok.
terminate(Host, ServerHost) -> terminate(Host, ServerHost) ->
@ -208,3 +210,25 @@ set_item(Item) ->
get_item_name(Host, Node, Id) -> get_item_name(Host, Node, Id) ->
node_default:get_item_name(Host, Node, Id). node_default:get_item_name(Host, Node, Id).
%%%
%%% Internal
%%%
%% @doc Check mod_caps is enabled, otherwise show warning.
%% The PEP plugin for mod_pubsub requires mod_caps to be enabled in the host.
%% Check that the mod_caps module is enabled in that Jabber Host
%% If not, show a warning message in the ejabberd log file.
complain_if_modcaps_disabled(ServerHost) ->
Modules = ejabberd_config:get_local_option({modules, ServerHost}),
ModCaps = [mod_caps_enabled || {mod_caps, _Opts} <- Modules],
case ModCaps of
[] ->
?WARNING_MSG("The PEP plugin is enabled in mod_pubsub of host ~p. "
"This plugin requires mod_caps to be enabled, "
"but it isn't.", [ServerHost]);
_ ->
ok
end.