fix delete-items issue and manage-affiliations typo

SVN Revision: 1868

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index c0f500af22ad18f4380f95fb4091639b9d7edc6a..a663d8fded58652980c52589c136700df5083671 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -1584,7 +1584,7 @@ delete_item(Host, Node, Publisher, ItemId, ForceNotify) ->
     Action = fun(#pubsub_node{type = Type}) ->
                     Features = features(Type),
                     PersistentFeature = lists:member("persistent-items", Features),
-                    DeleteFeature = lists:member("delete-any", Features),
+                    DeleteFeature = lists:member("delete-items", Features),
                     if
                         %%->   iq_pubsub just does that matchs
                         %%     %% Request does not specify an item
@@ -1594,7 +1594,7 @@ delete_item(Host, Node, Publisher, ItemId, ForceNotify) ->
                             {error, extended_error(?ERR_FEATURE_NOT_IMPLEMENTED, unsupported, "persistent-items")};
                         not DeleteFeature ->
                             %% Service does not support item deletion
-                            {error, extended_error(?ERR_FEATURE_NOT_IMPLEMENTED, unsupported, "delete-any")};
+                            {error, extended_error(?ERR_FEATURE_NOT_IMPLEMENTED, unsupported, "delete-items")};
                         true ->
                             node_call(Type, delete_item, [Host, Node, Publisher, ItemId])
                     end
@@ -1987,7 +1987,7 @@ get_subscriptions(Host, Node, JID) ->
                     if
                         not RetrieveFeature ->
                             %% Service does not support manage subscriptions
-                            {error, extended_error(?ERR_FEATURE_NOT_IMPLEMENTED, unsupported, "manage-affiliations")};
+                            {error, extended_error(?ERR_FEATURE_NOT_IMPLEMENTED, unsupported, "manage-subscriptions")};
                         Affiliation /= {result, owner} ->
                             %% Entity is not an owner
                             {error, ?ERR_FORBIDDEN};
@@ -2693,7 +2693,7 @@ features() ->
         "config-node",   % RECOMMENDED
         "create-and-configure",   % RECOMMENDED
         % see plugin "create-nodes",   % RECOMMENDED
-        % see plugin "delete-any",   % RECOMMENDED
+        % see plugin "delete-items",   % RECOMMENDED
         % see plugin "delete-nodes",   % RECOMMENDED
         % see plugin "filtered-notifications",   % RECOMMENDED
         %TODO "get-pending",   % OPTIONAL

diff --git a/src/mod_pubsub/node.template b/src/mod_pubsub/node.template
index af90266a0bfda71e02d39dfe44a2fd26cf65cfa8..536f1775bd814af51e04712c7c19cf358d2a8ab1 100644 (file)
--- a/src/mod_pubsub/node.template
+++ b/src/mod_pubsub/node.template
@@ -95,7 +95,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
-     "delete-any",
+     "delete-items",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",

diff --git a/src/mod_pubsub/node_buddy.erl b/src/mod_pubsub/node_buddy.erl
index cfb39ac6fd71b59e4883f97a2af237fab9d0dbb1..029543dc2698d8e69da353f4faa39511623f38dd 100644 (file)
--- a/src/mod_pubsub/node_buddy.erl
+++ b/src/mod_pubsub/node_buddy.erl
@@ -97,7 +97,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
-     "delete-any",
+     "delete-items",
      "instant-nodes",
      "item-ids",
      "outcast-affiliation",

diff --git a/src/mod_pubsub/node_club.erl b/src/mod_pubsub/node_club.erl
index dab30992ff74d49b57fb019c38df0eab07e0ba2e..c164b36b3889b3256f2b645f38e600dea0b8f24a 100644 (file)
--- a/src/mod_pubsub/node_club.erl
+++ b/src/mod_pubsub/node_club.erl
@@ -97,7 +97,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
-     "delete-any",
+     "delete-items",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",

diff --git a/src/mod_pubsub/node_default.erl b/src/mod_pubsub/node_default.erl
index 20543e3321c2a1a9cf1f74b07795abf01ea95e4b..f6369f0df7a379a7ea82d459c6b8aec94c20d75c 100644 (file)
--- a/src/mod_pubsub/node_default.erl
+++ b/src/mod_pubsub/node_default.erl
@@ -159,7 +159,7 @@ features() ->
     ["create-nodes",
      "auto-create",
      "delete-nodes",
-     "delete-any",
+     "delete-items",
      "instant-nodes",
      "manage-subscriptions",
      "modify-affiliations",

diff --git a/src/mod_pubsub/node_mb.erl b/src/mod_pubsub/node_mb.erl
index 056886b056db608e761ea355b49c9bedbee111b1..a092102ad53ca46c57a689bed597b29a58fc6f95 100644 (file)
--- a/src/mod_pubsub/node_mb.erl
+++ b/src/mod_pubsub/node_mb.erl
@@ -102,7 +102,7 @@ features() ->
      "auto-create", %*
      "auto-subscribe", %*
      "delete-nodes", %*
-     "delete-any", %*
+     "delete-items", %*
      "filtered-notifications", %*
      "modify-affiliations",
      "outcast-affiliation",

diff --git a/src/mod_pubsub/node_pep.erl b/src/mod_pubsub/node_pep.erl
index 76609f1e3a5de4ba7cebdbd8d53afb9f9a2362cb..2c322530ffe1299ce5e3b2fc43ebfc24b1e1b582 100644 (file)
--- a/src/mod_pubsub/node_pep.erl
+++ b/src/mod_pubsub/node_pep.erl
@@ -97,7 +97,7 @@ features() ->
      "auto-create", %*
      "auto-subscribe", %*
      "delete-nodes", %*
-     "delete-any", %*
+     "delete-items", %*
      "filtered-notifications", %*
      "modify-affiliations",
      "outcast-affiliation",

diff --git a/src/mod_pubsub/node_private.erl b/src/mod_pubsub/node_private.erl
index d1e31374fa663858753aaab657121ed7ce2eff0a..963e40ad25aed3e64ef091ce44f12dfd010f14ca 100644 (file)
--- a/src/mod_pubsub/node_private.erl
+++ b/src/mod_pubsub/node_private.erl
@@ -97,7 +97,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
-     "delete-any",
+     "delete-items",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",

diff --git a/src/mod_pubsub/node_public.erl b/src/mod_pubsub/node_public.erl
index 125025c569d3a63817bc6bc545a4d49315d6c02a..e237f17e3480b3d3fe3b3cb8a347660c8336bfa2 100644 (file)
--- a/src/mod_pubsub/node_public.erl
+++ b/src/mod_pubsub/node_public.erl
@@ -97,7 +97,7 @@ options() ->
 features() ->
     ["create-nodes",
      "delete-nodes",
-     "delete-any",
+     "delete-items",
      "instant-nodes",
      "outcast-affiliation",
      "persistent-items",