check if user is disabled in list of receiver, revisors

This commit is contained in:
Uwe Steinmann 2017-07-20 17:02:09 +02:00
parent 28e84443d8
commit cfc73b1183

View File

@ -1173,8 +1173,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
switch ($r["type"]) {
case 0: // Recipient is an individual.
$required = $dms->getUser($r["required"]);
if($user->isAdmin() && ($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ))
$accesserr = getMLText("access_denied");
if($user->isAdmin()) {
if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
$accesserr = getMLText("access_denied");
elseif(is_object($required) && $required->isDisabled())
$accesserr = getMLText("login_disabled_title");
}
if (!is_object($required)) {
$reqName = getMLText("unknown_user")." '".$r["required"]."'";
}
@ -1292,9 +1296,16 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
foreach ($revisionStatus as $r) {
$required = null;
$is_recipient = false;
$accesserr = '';
switch ($r["type"]) {
case 0: // Reviewer is an individual.
$required = $dms->getUser($r["required"]);
if($user->isAdmin()) {
if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
$accesserr = getMLText("access_denied");
elseif(is_object($required) && $required->isDisabled())
$accesserr = getMLText("login_disabled_title");
}
if (!is_object($required)) {
$reqName = getMLText("unknown_user")." '".$r["required"]."'";
}
@ -1325,7 +1336,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<td>".htmlspecialchars($r["comment"])."</td>\n";
print "<td>".getRevisionStatusText($r["status"])."</td>\n";
print "<td><ul class=\"unstyled\">";
if($accesserr)
echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
if($accessop->mayRevise($document)) {
if ($is_recipient && $r["status"]==0) {
print "<li>".$this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini'), getMLText("add_revision"), false, true)."</li>";