From de84b295a5d5867ad4e776ab3318f2f1713d117e Mon Sep 17 00:00:00 2001 From: steinm Date: Fri, 7 Oct 2011 16:16:31 +0000 Subject: [PATCH] - do not allow access if group was explicitly withdrawn any rights --- LetoDMS_Core/Core/inc.ClassDocument.php | 6 +++--- LetoDMS_Core/Core/inc.ClassFolder.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LetoDMS_Core/Core/inc.ClassDocument.php b/LetoDMS_Core/Core/inc.ClassDocument.php index 989fd0596..b3a4645ff 100644 --- a/LetoDMS_Core/Core/inc.ClassDocument.php +++ b/LetoDMS_Core/Core/inc.ClassDocument.php @@ -711,13 +711,13 @@ class LetoDMS_Core_Document { /* {{{ */ return $userAccess->getMode(); } } - $result = $this->getDefaultAccess(); foreach ($accessList["groups"] as $groupAccess) { if ($user->isMemberOfGroup($groupAccess->getGroup())) { - if ($groupAccess->getMode()>$result) - $result = $groupAccess->getMode(); +// if ($groupAccess->getMode()>$result) + return $groupAccess->getMode(); } } + $result = $this->getDefaultAccess(); return $result; } /* }}} */ diff --git a/LetoDMS_Core/Core/inc.ClassFolder.php b/LetoDMS_Core/Core/inc.ClassFolder.php index c4f84ae70..21ddf2467 100644 --- a/LetoDMS_Core/Core/inc.ClassFolder.php +++ b/LetoDMS_Core/Core/inc.ClassFolder.php @@ -721,13 +721,13 @@ class LetoDMS_Core_Folder { return $userAccess->getMode(); } } - $result = $this->getDefaultAccess(); foreach ($accessList["groups"] as $groupAccess) { if ($user->isMemberOfGroup($groupAccess->getGroup())) { - if ($groupAccess->getMode()>$result) - $result = $groupAccess->getMode(); +// if ($groupAccess->getMode()>$result) + return $groupAccess->getMode(); } } + $result = $this->getDefaultAccess(); return $result; } /* }}} */