From 48e15804e37966009dcf8ad7f35af139b00f34cc Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Fri, 25 Jan 2008 09:24:10 +0000 Subject: [PATCH] pubsub configuration patch (EJAB-508) and (EJAB-509) SVN Revision: 1158 --- ChangeLog | 14 ++++++++++++++ src/mod_pubsub/mod_pubsub.erl | 4 ++-- src/mod_pubsub/node.template | 2 +- src/mod_pubsub/node_buddy.erl | 2 +- src/mod_pubsub/node_club.erl | 2 +- src/mod_pubsub/node_default.erl | 2 +- src/mod_pubsub/node_dispatch.erl | 2 +- src/mod_pubsub/node_pep.erl | 2 +- src/mod_pubsub/node_private.erl | 2 +- src/mod_pubsub/node_public.erl | 2 +- 10 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ae80e68a..783eb8680 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-01-25 Christophe Romain + + * 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 * doc/guide.tex: Updated the names of log files. diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index f852e7be6..a0a864c6d 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -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), diff --git a/src/mod_pubsub/node.template b/src/mod_pubsub/node.template index 82b1580fa..fa80763c4 100644 --- a/src/mod_pubsub/node.template +++ b/src/mod_pubsub/node.template @@ -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}, diff --git a/src/mod_pubsub/node_buddy.erl b/src/mod_pubsub/node_buddy.erl index 86df73863..d817927c2 100644 --- a/src/mod_pubsub/node_buddy.erl +++ b/src/mod_pubsub/node_buddy.erl @@ -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}, diff --git a/src/mod_pubsub/node_club.erl b/src/mod_pubsub/node_club.erl index 8d7425d22..62076ecbd 100644 --- a/src/mod_pubsub/node_club.erl +++ b/src/mod_pubsub/node_club.erl @@ -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}, diff --git a/src/mod_pubsub/node_default.erl b/src/mod_pubsub/node_default.erl index df11f954f..5f3276361 100644 --- a/src/mod_pubsub/node_default.erl +++ b/src/mod_pubsub/node_default.erl @@ -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}, diff --git a/src/mod_pubsub/node_dispatch.erl b/src/mod_pubsub/node_dispatch.erl index 333fe7eba..6c62b96b6 100644 --- a/src/mod_pubsub/node_dispatch.erl +++ b/src/mod_pubsub/node_dispatch.erl @@ -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}, diff --git a/src/mod_pubsub/node_pep.erl b/src/mod_pubsub/node_pep.erl index 205658d25..63ee60bf5 100644 --- a/src/mod_pubsub/node_pep.erl +++ b/src/mod_pubsub/node_pep.erl @@ -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}, diff --git a/src/mod_pubsub/node_private.erl b/src/mod_pubsub/node_private.erl index 28645d79c..03a4a2f75 100644 --- a/src/mod_pubsub/node_private.erl +++ b/src/mod_pubsub/node_private.erl @@ -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}, diff --git a/src/mod_pubsub/node_public.erl b/src/mod_pubsub/node_public.erl index db5138f2e..f644649d3 100644 --- a/src/mod_pubsub/node_public.erl +++ b/src/mod_pubsub/node_public.erl @@ -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},