fix get_item issue on authorize access model (thanks to brian cully) (EJAB-1060)

SVN Revision: 2660

diff --git a/src/mod_pubsub/node_hometree.erl b/src/mod_pubsub/node_hometree.erl
index d557a1a10ea38a3de6089684327680c5b1f3302f..efb14c9223044bcf2f0ad0f0163023a384db1cc5 100644 (file)
--- a/src/mod_pubsub/node_hometree.erl
+++ b/src/mod_pubsub/node_hometree.erl
@@ -907,7 +907,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(?ERR_NOT_ALLOWED, "closed-node")};
-       (AccessModel == authorize) -> % TODO: to be done
+       (AccessModel == authorize) and (not Whitelisted) ->
            %% Node has authorize access model
            {error, ?ERR_FORBIDDEN};
        %%MustPay ->
@@ -955,7 +955,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(?ERR_NOT_ALLOWED, "closed-node")};
-       (AccessModel == authorize) -> % TODO: to be done
+       (AccessModel == authorize) and (not Whitelisted) ->
            %% Node has authorize access model
            {error, ?ERR_FORBIDDEN};
        %%MustPay ->

diff --git a/src/mod_pubsub/node_hometree_odbc.erl b/src/mod_pubsub/node_hometree_odbc.erl
index b4ac3fec7ab08d97d84e60ca3512755c973e4443..4056d1e843d9e2558f2b38bd55f89f7991f4578c 100644 (file)
--- 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(?ERR_NOT_ALLOWED, "closed-node")};
-       (AccessModel == authorize) -> % TODO: to be done
+       (AccessModel == authorize) and (not Whitelisted)
            %% Node has authorize access model
            {error, ?ERR_FORBIDDEN};
        %%MustPay ->
@@ -1145,7 +1145,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(?ERR_NOT_ALLOWED, "closed-node")};
-       (AccessModel == authorize) -> % TODO: to be done
+       (AccessModel == authorize) and (not Whitelisted)
            %% Node has authorize access model
            {error, ?ERR_FORBIDDEN};
        %%MustPay ->