Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2025-01-01 17:53:00 +01:00
Code Releases Activity

fix delete-items issue and manage-affiliations typo

Browse Source 
SVN Revision: 1868
This commit is contained in:
Christophe Romain 2009-02-09 13:37:58 +00:00
parent ec31aef6cb
commit bb13c9e8ab
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mod_pubsub/mod_pubsub.erl
View File

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

2
src/mod_pubsub/node.template
View File

@ -95,7 +95,7 @@ options() ->
features() -> features() ->
["create-nodes", ["create-nodes",
"delete-nodes", "delete-nodes",
"delete-any", "delete-items",
"instant-nodes", "instant-nodes",
"outcast-affiliation", "outcast-affiliation",
"persistent-items", "persistent-items",

2
src/mod_pubsub/node_buddy.erl
View File

@ -97,7 +97,7 @@ options() ->
features() -> features() ->
["create-nodes", ["create-nodes",
"delete-nodes", "delete-nodes",
"delete-any", "delete-items",
"instant-nodes", "instant-nodes",
"item-ids", "item-ids",
"outcast-affiliation", "outcast-affiliation",

2
src/mod_pubsub/node_club.erl
View File

@ -97,7 +97,7 @@ options() ->
features() -> features() ->
["create-nodes", ["create-nodes",
"delete-nodes", "delete-nodes",
"delete-any", "delete-items",
"instant-nodes", "instant-nodes",
"outcast-affiliation", "outcast-affiliation",
"persistent-items", "persistent-items",

2
src/mod_pubsub/node_default.erl
View File

@ -159,7 +159,7 @@ features() ->
["create-nodes", ["create-nodes",
"auto-create", "auto-create",
"delete-nodes", "delete-nodes",
"delete-any", "delete-items",
"instant-nodes", "instant-nodes",
"manage-subscriptions", "manage-subscriptions",
"modify-affiliations", "modify-affiliations",

2
src/mod_pubsub/node_mb.erl
View File

@ -102,7 +102,7 @@ features() ->
"auto-create", %* "auto-create", %*
"auto-subscribe", %* "auto-subscribe", %*
"delete-nodes", %* "delete-nodes", %*
"delete-any", %* "delete-items", %*
"filtered-notifications", %* "filtered-notifications", %*
"modify-affiliations", "modify-affiliations",
"outcast-affiliation", "outcast-affiliation",

2
src/mod_pubsub/node_pep.erl
View File

@ -97,7 +97,7 @@ features() ->
"auto-create", %* "auto-create", %*
"auto-subscribe", %* "auto-subscribe", %*
"delete-nodes", %* "delete-nodes", %*
"delete-any", %* "delete-items", %*
"filtered-notifications", %* "filtered-notifications", %*
"modify-affiliations", "modify-affiliations",
"outcast-affiliation", "outcast-affiliation",

2
src/mod_pubsub/node_private.erl
View File

@ -97,7 +97,7 @@ options() ->
features() -> features() ->
["create-nodes", ["create-nodes",
"delete-nodes", "delete-nodes",
"delete-any", "delete-items",
"instant-nodes", "instant-nodes",
"outcast-affiliation", "outcast-affiliation",
"persistent-items", "persistent-items",

2
src/mod_pubsub/node_public.erl
View File

@ -97,7 +97,7 @@ options() ->
features() -> features() ->
["create-nodes", ["create-nodes",
"delete-nodes", "delete-nodes",
"delete-any", "delete-items",
"instant-nodes", "instant-nodes",
"outcast-affiliation", "outcast-affiliation",
"persistent-items", "persistent-items",