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

SVN Revision: 1158

diff --git a/ChangeLog b/ChangeLog
index 3ae80e68a380c663a3e0420bc257ec53731809c1..6f42395a5a438cf6e0b09eb3608d17ac92cd6dd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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
+
 2008-01-16  Badlop  <badlop@process-one.net>
 
        * 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 f852e7be62f768df5c9d23dc9670d6729c682253..a0a864c6d056cd522da3b763a1c434720eec3ad7 100644 (file)
--- 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 82b1580fa5645007473e7c00cdc8429512022c23..fa80763c4eaf5d5b5f5902deb99afc8e7818cf37 100644 (file)
--- 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 86df7386316f6990c49dd561ec442620b361fcd5..d817927c20268a2a64bb3bf95d7c49cac0edbab0 100644 (file)
--- 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 8d7425d221636eabc0bc677438500bf06f76891c..62076ecbdf1a41f005817111f12e894cc7adcff9 100644 (file)
--- 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 df11f954f4bef972c74f7364f5191bd8ea4fa403..5f327636119e15e5a35a03a2ee4f4a29b9af07bd 100644 (file)
--- 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 333fe7eba6c66d987e08c5de8cca4585cf77a5b8..6c62b96b64f7aa7195b009e26c3290fc29b37967 100644 (file)
--- 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 205658d25601ea5955d4154f239c6a2474a713a5..63ee60bf5056327e52972df76198f1e7dc365a62 100644 (file)
--- 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 28645d79cd8f307aaf3002efbf9b695cf20ebe15..03a4a2f7554ba1cd15ffe15e9010aba87664fbdb 100644 (file)
--- 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 db5138f2e309594e56344dc05d38958cec58e69f..f644649d3d151da519e400deca7e4ee09a5ed7c2 100644 (file)
--- 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},