gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-08 20:46:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

also check if user is disabled

Browse Source
This commit is contained in:
Uwe Steinmann 2017-07-20 17:00:19 +02:00
parent 7259c668c4
commit 9e87300567
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
out/out.ObjectCheck.php
View File

@ -75,8 +75,10 @@ $tmprevs = $dms->getDocumentsInRevision();
$docsinrevision = array(); $docsinrevision = array();
foreach($tmprevs as $rev) { foreach($tmprevs as $rev) {
if($doc = $dms->getDocument($rev['documentID'])) { if($doc = $dms->getDocument($rev['documentID'])) {
$isdisabled = false;
if($rev['type'] == 0) { if($rev['type'] == 0) {
$ruser = $dms->getUser($rev['required']); $ruser = $dms->getUser($rev['required']);
$isdisabled = $ruser->isDisabled();
$mode = $doc->getAccessMode($ruser); $mode = $doc->getAccessMode($ruser);
$content = $doc->getContentByVersion($rev['version']); $content = $doc->getContentByVersion($rev['version']);
$cmode = $content->getAccessMode($ruser); $cmode = $content->getAccessMode($ruser);
@ -88,7 +90,7 @@ foreach($tmprevs as $rev) {
/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role /* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
* restrictions of the currently logged in user * restrictions of the currently logged in user
*/ */
if($mode < M_READ || $cmode < M_READ) if($mode < M_READ || $cmode < M_READ || $isdisabled)
$docsinrevision[] = $doc; $docsinrevision[] = $doc;
} }
} }
@ -96,8 +98,10 @@ $tmprevs = $dms->getDocumentsInReception();
$docsinreception = array(); $docsinreception = array();
foreach($tmprevs as $rev) { foreach($tmprevs as $rev) {
if($doc = $dms->getDocument($rev['documentID'])) { if($doc = $dms->getDocument($rev['documentID'])) {
$isdisabled = false;
if($rev['type'] == 0) { if($rev['type'] == 0) {
$ruser = $dms->getUser($rev['required']); $ruser = $dms->getUser($rev['required']);
$isdisabled = $ruser->isDisabled();
$mode = $doc->getAccessMode($ruser); $mode = $doc->getAccessMode($ruser);
$content = $doc->getContentByVersion($rev['version']); $content = $doc->getContentByVersion($rev['version']);
$cmode = $content->getAccessMode($ruser); $cmode = $content->getAccessMode($ruser);
@ -109,7 +113,7 @@ foreach($tmprevs as $rev) {
/* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role /* Caution: $content->getAccessMode($ruser) doesn't work as it uses the role
* restrictions of the currently logged in user * restrictions of the currently logged in user
*/ */
if($mode < M_READ || $cmode < M_READ) if($mode < M_READ || $cmode < M_READ || $isdisabled)
$docsinreception[] = $doc; $docsinreception[] = $doc;
} }
} }