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

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

Browse Source 
SVN Revision: 2660
This commit is contained in:
Christophe Romain 2009-10-12 15:22:14 +00:00
parent c311ea1505
commit 3128c26766
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod_pubsub/node_hometree.erl
View File

@ -907,7 +907,7 @@ get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId) -
(AccessModel == whitelist) and (not Whitelisted) -> (AccessModel == whitelist) and (not Whitelisted) ->
%% Node has whitelist access model and entity lacks required affiliation %% Node has whitelist access model and entity lacks required affiliation
{error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")}; {error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")};
(AccessModel == authorize) -> % TODO: to be done (AccessModel == authorize) and (not Whitelisted) ->
%% Node has authorize access model %% Node has authorize access model
{error, ?ERR_FORBIDDEN}; {error, ?ERR_FORBIDDEN};
%%MustPay -> %%MustPay ->
@ -955,7 +955,7 @@ get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, _S
(AccessModel == whitelist) and (not Whitelisted) -> (AccessModel == whitelist) and (not Whitelisted) ->
%% Node has whitelist access model and entity lacks required affiliation %% Node has whitelist access model and entity lacks required affiliation
{error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")}; {error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")};
(AccessModel == authorize) -> % TODO: to be done (AccessModel == authorize) and (not Whitelisted) ->
%% Node has authorize access model %% Node has authorize access model
{error, ?ERR_FORBIDDEN}; {error, ?ERR_FORBIDDEN};
%%MustPay -> %%MustPay ->

4
src/mod_pubsub/node_hometree_odbc.erl
View File

@ -1082,7 +1082,7 @@ get_items(NodeId, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId, R
(AccessModel == whitelist) and (not Whitelisted) -> (AccessModel == whitelist) and (not Whitelisted) ->
%% Node has whitelist access model and entity lacks required affiliation %% Node has whitelist access model and entity lacks required affiliation
{error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")}; {error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")};
(AccessModel == authorize) -> % TODO: to be done (AccessModel == authorize) and (not Whitelisted)
%% Node has authorize access model %% Node has authorize access model
{error, ?ERR_FORBIDDEN}; {error, ?ERR_FORBIDDEN};
%%MustPay -> %%MustPay ->
@ -1145,7 +1145,7 @@ get_item(NodeId, ItemId, JID, AccessModel, PresenceSubscription, RosterGroup, _S
(AccessModel == whitelist) and (not Whitelisted) -> (AccessModel == whitelist) and (not Whitelisted) ->
%% Node has whitelist access model and entity lacks required affiliation %% Node has whitelist access model and entity lacks required affiliation
{error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")}; {error, ?ERR_EXTENDED(?ERR_NOT_ALLOWED, "closed-node")};
(AccessModel == authorize) -> % TODO: to be done (AccessModel == authorize) and (not Whitelisted)
%% Node has authorize access model %% Node has authorize access model
{error, ?ERR_FORBIDDEN}; {error, ?ERR_FORBIDDEN};
%%MustPay -> %%MustPay ->