Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

pubsub configuration patch (EJAB-508) and (EJAB-509) 

SVN Revision: 1158
This commit is contained in:
Christophe Romain 2008-01-25 09:24:10 +00:00
parent 50f0c3a14b
commit 48e15804e3
10 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2008-01-25 Christophe Romain <christophe.romain@process-one.net>
* src/mod_pubsub/mod_pubsub.erl: Setting boolean node configuration
fixed (EJAB-509)
* src/mod_pubsub/node_default.erl: Use roster_groups_allowed instead
of access_roster_groups (EJAB-508)
* src/mod_pubsub/node_pep.erl: Likewise
* src/mod_pubsub/node_buddy.erl: Likewise
* src/mod_pubsub/node_club.erl: Likewise
* src/mod_pubsub/node_dispatch.erl: Likewise
* src/mod_pubsub/node_private.erl: Likewise
* src/mod_pubsub/node_public.erl: Likewise
* src/mod_pubsub/node.template: Likewise
2008-01-16 Badlop <badlop@process-one.net>
* doc/guide.tex: Updated the names of log files.

4
src/mod_pubsub/mod_pubsub.erl
View File

@ -2434,7 +2434,7 @@ get_configure_xfields(_Type, Options, _Owners, Lang) ->
[open, authorize, presence, roster, whitelist]),
%% XXX: change to list-multi, include current roster groups as options
{xmlelement, "field", [{"type", "text-multi"},
{"label", translate:translate(Lang, "Roster groups that may subscribe (if access model is roster)")},
{"label", translate:translate(Lang, "Roster groups allowed to subscribe")},
{"var", "pubsub#roster_groups_allowed"}],
[{xmlelement, "value", [], [{xmlcdata, Value}]} ||
Value <- get_option(Options, roster_groups_allowed)]},
@ -2515,7 +2515,7 @@ add_opt(Key, Value, Opts) ->
end,
case BoolVal of
error -> {error, ?ERR_NOT_ACCEPTABLE};
_ -> set_xoption(Opts, add_opt(Opt, false, NewOpts))
_ -> set_xoption(Opts, add_opt(Opt, BoolVal, NewOpts))
end).
-define(SET_STRING_XOPT(Opt, Val),

2
src/mod_pubsub/node.template
View File

@ -83,7 +83,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, open},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, never},

2
src/mod_pubsub/node_buddy.erl
View File

@ -84,7 +84,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, presence},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, never},

2
src/mod_pubsub/node_club.erl
View File

@ -84,7 +84,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, authorize},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, never},

2
src/mod_pubsub/node_default.erl
View File

@ -142,7 +142,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, open},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, on_sub_and_presence},

2
src/mod_pubsub/node_dispatch.erl
View File

@ -82,7 +82,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, open},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, never},

2
src/mod_pubsub/node_pep.erl
View File

@ -80,7 +80,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, presence},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, on_sub_and_presence},

2
src/mod_pubsub/node_private.erl
View File

@ -84,7 +84,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, whitelist},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, never},

2
src/mod_pubsub/node_public.erl
View File

@ -84,7 +84,7 @@ options() ->
{max_items, ?MAXITEMS div 2},
{subscribe, true},
{access_model, open},
{access_roster_groups, []},
{roster_groups_allowed, []},
{publish_model, publishers},
{max_payload_size, ?MAX_PAYLOAD_SIZE},
{send_last_published_item, never},