Merge branch 'seeddms-4.3.x' into seeddms-5.0.x

This commit is contained in:
Uwe Steinmann 2017-01-26 14:44:33 +01:00
commit 7a674b9162

View File

@ -58,21 +58,28 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if (count($accessList["users"]) == 0 && count($accessList["groups"]) == 0) if (count($accessList["users"]) == 0 && count($accessList["groups"]) == 0)
return; return;
$content = '';
for ($i = 0; $i < count($accessList["groups"]); $i++) for ($i = 0; $i < count($accessList["groups"]); $i++)
{ {
$group = $accessList["groups"][$i]->getGroup(); $group = $accessList["groups"][$i]->getGroup();
$accesstext = $this->getAccessModeText($accessList["groups"][$i]->getMode()); $accesstext = $this->getAccessModeText($accessList["groups"][$i]->getMode());
print $accesstext.": ".htmlspecialchars($group->getName()); $content .= $accesstext.": ".htmlspecialchars($group->getName());
if ($i+1 < count($accessList["groups"]) || count($accessList["users"]) > 0) if ($i+1 < count($accessList["groups"]) || count($accessList["users"]) > 0)
print "<br />"; $content .= "<br />";
} }
for ($i = 0; $i < count($accessList["users"]); $i++) for ($i = 0; $i < count($accessList["users"]); $i++)
{ {
$user = $accessList["users"][$i]->getUser(); $user = $accessList["users"][$i]->getUser();
$accesstext = $this->getAccessModeText($accessList["users"][$i]->getMode()); $accesstext = $this->getAccessModeText($accessList["users"][$i]->getMode());
print $accesstext.": ".htmlspecialchars($user->getFullName()); $content .= $accesstext.": ".htmlspecialchars($user->getFullName());
if ($i+1 < count($accessList["users"])) if ($i+1 < count($accessList["users"]))
print "<br />"; $content .= "<br />";
}
if(count($accessList["groups"]) + count($accessList["users"]) > 3) {
$this->printPopupBox(getMLText('list_access_rights'), $content);
} else {
echo $content;
} }
} /* }}} */ } /* }}} */