diff options
author | ElgarL <ElgarL@Palmergames.com> | 2013-05-22 10:37:24 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2014-05-04 12:50:02 +0100 |
commit | 28036b7d1793cf729badd6aa6dbc718f1c3581eb (patch) | |
tree | d5465e955419674a19e9869c8cb066663bf08ad4 /EssentialsGroupManager/src/org/anjocaido/groupmanager | |
parent | 721d5c2f5c6f1a496f4bd502f7babef2fbbd98c8 (diff) | |
download | Essentials-28036b7d1793cf729badd6aa6dbc718f1c3581eb.tar Essentials-28036b7d1793cf729badd6aa6dbc718f1c3581eb.tar.gz Essentials-28036b7d1793cf729badd6aa6dbc718f1c3581eb.tar.lz Essentials-28036b7d1793cf729badd6aa6dbc718f1c3581eb.tar.xz Essentials-28036b7d1793cf729badd6aa6dbc718f1c3581eb.zip |
Check subgroup permissions with an equal priority so no one subgroup is higher ranked than another.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java index bef2fb713..3a6adee2e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -849,13 +849,26 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { // SUBGROUPS CHECK for (Group subGroup : user.subGroupListCopy()) { PermissionCheckResult resultSubGroup = checkGroupPermissionWithInheritance(subGroup, targetPermission); + + if (resultSubGroup.resultType != PermissionCheckResult.Type.NOTFOUND) { - resultSubGroup.accessLevel = targetPermission; - return resultSubGroup; + + if ((resultSubGroup.resultType == PermissionCheckResult.Type.FOUND) && (result.resultType != PermissionCheckResult.Type.NEGATION)) { + resultSubGroup.accessLevel = targetPermission; + result = resultSubGroup; + } else if (resultSubGroup.resultType == PermissionCheckResult.Type.EXCEPTION) { + resultSubGroup.accessLevel = targetPermission; + return resultSubGroup; + } else if (resultSubGroup.resultType == PermissionCheckResult.Type.NEGATION) { + resultSubGroup.accessLevel = targetPermission; + result = resultSubGroup; + } + } } // THEN IT RETURNS A NOT FOUND + // OR THE RESULT OF THE SUBGROUP SEARCH. return result; } |