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

enable pep by default and add pubsub plugin examples

Browse Source 
SVN Revision: 1031
This commit is contained in:
Christophe Romain 2007-12-06 09:29:28 +00:00
parent 749a4305b4
commit c90579146c
7 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2007-12-06 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/node_dispatch.erl: Correct syntax issue
* src/mod_pubsub/Makefile.in: include example plugins
* src/mod_pubsub/Makefile.win32: likewise
* src/ejabberd.cfg.example: use default and pep pubsub plugins
* doc/guide.tex: add nodetree and plugins pubsub option
* doc/guite.html: likewise
2007-12-06 Badlop <badlop@process-one.net>
* doc/guide.tex: Document the Debug Console (EJAB-395)

12
doc/guide.html
View File

@ -2933,7 +2933,14 @@ Options:
be served, you can use this option. If absent, only the main <TT>ejabberd</TT>
host is served. <DT CLASS="dt-description"><B><TT>access_createnode</TT></B><DD CLASS="dd-description">
This option restricts which users are allowed to create pubsub nodes using
ACL and ACCESS. The default value is <TT>pubsub_createnode</TT>. </DL>
ACL and ACCESS. The default value is <TT>pubsub_createnode</TT>.
<DT CLASS="dt-description"><B><TT>plugins</TT></B><DD CLASS="dd-description"> To specify which pubsub node plugins to use.
If not defined, the default plugin is always used.
<DT CLASS="dt-description"><B><TT>nodetree</TT></B><DD CLASS="dd-description"> To specify which nodetree plugin to use.
If not defined, the default pubsub nodetree used. Nodetrees are default and virtual. Only one nodetree can be used
and is shared by all node plugins. </DL>
Example:
<PRE CLASS="verbatim">
{modules,
@ -2941,7 +2948,8 @@ Example:
...
{mod_pubsub, [{served_hosts, ["example.com",
"example.org"]},
{access_createnode, pubsub_createnode}]}
{access_createnode, pubsub_createnode},
{plugins, ["default","pep"]}]}
...
]}.
</PRE>

8
doc/guide.tex
View File

@ -2653,6 +2653,11 @@ Options:
\titem{access\_createnode} \ind{options!access\_createnode}
This option restricts which users are allowed to create pubsub nodes using
ACL and ACCESS. The default value is \term{pubsub\_createnode}. % Not clear enough + do not use abbreviations.
\titem{plugins} To specify which pubsub node plugins to use. If not defined, the default
pubsub plugin is always used.
\titem{nodetree} To specify which nodetree to use. If not defined, the default pubsub
nodetree is used. Nodetrees are default and virtual. Only one nodetree can be used
and is shared by all node plugins.
\end{description}
Example:
@ -2662,7 +2667,8 @@ Example:
...
{mod_pubsub, [{served_hosts, ["example.com",
"example.org"]},
{access_createnode, pubsub_createnode}]}
{access_createnode, pubsub_createnode},
{plugins, ["default","pep"]}]}
...
]}.
\end{verbatim}

2
src/ejabberd.cfg.example
View File

@ -407,7 +407,7 @@
{mod_privacy, []},
{mod_private, []},
%%{mod_proxy65,[]},
{mod_pubsub, [{access_createnode, pubsub_createnode}]},
{mod_pubsub, [{access_createnode, pubsub_createnode},{plugins,["default","pep"]}]},
{mod_register, [
%%
%% After successful registration, the user receives

7
src/mod_pubsub/Makefile.in
View File

@ -25,7 +25,12 @@ OBJS = \
$(OUTDIR)/nodetree_virtual.beam \
$(OUTDIR)/mod_pubsub.beam \
$(OUTDIR)/node_default.beam \
$(OUTDIR)/node_pep.beam
$(OUTDIR)/node_pep.beam \
$(OUTDIR)/node_buddy.beam \
$(OUTDIR)/node_club.beam \
$(OUTDIR)/node_dispatch.beam \
$(OUTDIR)/node_private.beam \
$(OUTDIR)/node_public.beam
all: $(OBJS)

7
src/mod_pubsub/Makefile.win32
View File

@ -11,7 +11,12 @@ OBJS = \
$(OUTDIR)/nodetree_virtual.beam \
$(OUTDIR)/mod_pubsub.beam \
$(OUTDIR)/node_default.beam \
$(OUTDIR)/node_pep.beam
$(OUTDIR)/node_pep.beam \
$(OUTDIR)/node_buddy.beam \
$(OUTDIR)/node_club.beam \
$(OUTDIR)/node_dispatch.beam \
$(OUTDIR)/node_private.beam \
$(OUTDIR)/node_public.beam
ALL : $(OBJS)

4
src/mod_pubsub/node_dispatch.erl
View File

@ -85,7 +85,7 @@ features() ->
%%"purge-nodes",
%%"retract-items",
%%"retrieve-affiliations",
"retrieve-items",
"retrieve-items"
%%"retrieve-subscriptions",
%%"subscribe",
%%"subscription-notifications",
@ -115,7 +115,7 @@ publish_item(Host, Node, Publisher, Model, MaxItems, ItemId, Payload) ->
end, nodetree_default:get_subnodes(Host, Node)).
remove_extra_items(_Host, _Node, _MaxItems, ItemIds) ->
{result, {ItemsIds, []}}.
{result, {ItemIds, []}}.
delete_item(_Host, _Node, _JID, _ItemId) ->
{error, ?ERR_ITEM_NOT_FOUND}.