Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2021-06-23 17:52:48 +02:00
commit 780d398d4c
2 changed files with 3 additions and 0 deletions

View File

@ -30,6 +30,7 @@ require_once("inc/inc.Authentication.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
if (!$user->isAdmin()) {
UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
}
@ -39,6 +40,7 @@ if($view) {
$view->setParam('log', array());
$view->setParam('newusers', array());
$view->setParam('colmap', array());
$view->setParam('accessobject', $accessop);
$view($_GET);
exit;
}

View File

@ -39,6 +39,7 @@ class SeedDMS_View_ImportUsers extends SeedDMS_Theme_Style {
function show() { /* {{{ */
$dms = $this->params['dms'];
$user = $this->params['user'];
$accessobject = $this->params['accessobject'];
$log = $this->params['log'];
$newusers = $this->params['newusers'];
$colmap = $this->params['colmap'];