From 2565a670b14723679f4e6229b7c749f7fc2de971 Mon Sep 17 00:00:00 2001 From: Christophe Romain Date: Mon, 12 Oct 2009 15:25:00 +0000 Subject: [PATCH] fix get_item issue on authorize access model (thanks to brian cully) (EJAB-1060) SVN Revision: 2661 --- src/mod_pubsub/node_hometree.erl | 4 ++-- src/mod_pubsub/node_hometree_odbc.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mod_pubsub/node_hometree.erl b/src/mod_pubsub/node_hometree.erl index 53835ab39..d8d933e4c 100644 --- a/src/mod_pubsub/node_hometree.erl +++ b/src/mod_pubsub/node_hometree.erl @@ -900,7 +900,7 @@ get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId) - (AccessModel == whitelist) and (not Whitelisted) -> %% Node has whitelist access model and entity lacks required affiliation {error, ?ERR_EXTENDED('not-allowed', "closed-node")}; - (AccessModel == authorize) -> % TODO: to be done + (AccessModel == authorize) and (not Whitelisted) -> %% Node has authorize access model {error, 'forbidden'}; %%MustPay -> @@ -947,7 +947,7 @@ get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, _S (AccessModel == whitelist) and (not Whitelisted) -> %% Node has whitelist access model and entity lacks required affiliation {error, ?ERR_EXTENDED('not-allowed', "closed-node")}; - (AccessModel == authorize) -> % TODO: to be done + (AccessModel == authorize) and (not Whitelisted) -> %% Node has authorize access model {error, 'forbidden'}; %%MustPay -> diff --git a/src/mod_pubsub/node_hometree_odbc.erl b/src/mod_pubsub/node_hometree_odbc.erl index acc92ab52..74d2ffd71 100644 --- a/src/mod_pubsub/node_hometree_odbc.erl +++ b/src/mod_pubsub/node_hometree_odbc.erl @@ -1082,7 +1082,7 @@ get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId, R (AccessModel == whitelist) and (not Whitelisted) -> %% Node has whitelist access model and entity lacks required affiliation {error, ?ERR_EXTENDED('not-allowed', "closed-node")}; - (AccessModel == authorize) -> % TODO: to be done + (AccessModel == authorize) and (not Whitelisted) -> %% Node has authorize access model {error, 'forbidden'}; %%MustPay -> @@ -1146,7 +1146,7 @@ get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, _S (AccessModel == whitelist) and (not Whitelisted) -> %% Node has whitelist access model and entity lacks required affiliation {error, ?ERR_EXTENDED('not-allowed', "closed-node")}; - (AccessModel == authorize) -> % TODO: to be done + (AccessModel == authorize) and (not Whitelisted) -> %% Node has authorize access model {error, 'forbidden'}; %%MustPay ->