fix delete-items issue and manage-affiliations typo

SVN Revision: 1868

9 files changed, 12 insertions, 12 deletions

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index c0f500af2..a663d8fde 100644
--- 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 af90266a0..536f1775b 100644
--- 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 cfb39ac6f..029543dc2 100644
--- 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 dab30992f..c164b36b3 100644
--- 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 20543e332..f6369f0df 100644
--- 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 056886b05..a092102ad 100644
--- 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 76609f1e3..2c322530f 100644
--- 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 d1e31374f..963e40ad2 100644
--- 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 125025c56..e237f17e3 100644
--- 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",