From 2c4b7295826825802a969cddff117b6ebbccf02c Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 22 Mar 2024 10:06:06 +0100
Subject: [PATCH] some code clean ups

---
 out/out.DocumentNotify.php |  9 +++++++--
 out/out.FolderNotify.php   | 12 ++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/out/out.DocumentNotify.php b/out/out.DocumentNotify.php
index 2a2780c84..cbe78d172 100644
--- a/out/out.DocumentNotify.php
+++ b/out/out.DocumentNotify.php
@@ -31,6 +31,9 @@ require_once("inc/inc.ClassUI.php");
 require_once("inc/inc.ClassAccessOperation.php");
 require_once("inc/inc.Authentication.php");
 
+$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
+
 if (!isset($_GET["documentid"]) || !is_numeric($_GET["documentid"]) || intval($_GET["documentid"]<1)) {
 	UI::exitError(getMLText("document_title", array("documentname" => getMLText("invalid_doc_id"))),getMLText("invalid_doc_id"));
 }
@@ -50,9 +53,11 @@ if ($document->getAccessMode($user) < M_READ) {
 /* Create object for checking access to certain operations */
 $accessop = new SeedDMS_AccessOperation($dms, $document, $user, $settings);
 
-$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'folder'=>$folder, 'document'=>$document, 'sortusersinlist'=>$settings->_sortUsersInList));
 if($view) {
+	$view->setParam('folder', $folder);
+	$view->setParam('document', $document);
+	$view->setParam('sortusersinlist', $settings->_sortUsersInList);
+	$view->setParam('enableusersview', $settings->_enableUsersView);
 	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
diff --git a/out/out.FolderNotify.php b/out/out.FolderNotify.php
index 35b3f2686..5a525466e 100644
--- a/out/out.FolderNotify.php
+++ b/out/out.FolderNotify.php
@@ -27,15 +27,16 @@ require_once("inc/inc.Init.php");
 require_once("inc/inc.Extension.php");
 require_once("inc/inc.DBInit.php");
 require_once("inc/inc.ClassUI.php");
+require_once("inc/inc.ClassAccessOperation.php");
 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 (!isset($_GET["folderid"]) || !is_numeric($_GET["folderid"]) || intval($_GET["folderid"])<1) {
 	UI::exitError(getMLText("folder_title", array("foldername" => getMLText("invalid_folder_id"))),getMLText("invalid_folder_id"));
 }
+
 $folder = $dms->getFolder($_GET["folderid"]);
 
 if (!is_object($folder)) {
@@ -46,16 +47,15 @@ if ($folder->getAccessMode($user) < M_READ) {
 	UI::exitError(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))),getMLText("access_denied"));
 }
 
-$allUsers = $dms->getAllUsers($settings->_sortUsersInList);
-$allGroups = $dms->getAllGroups();
+/* Create object for checking access to certain operations */
+$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
 
 if($view) {
 	$view->setParam('showtree', showtree());
 	$view->setParam('folder', $folder);
-	$view->setParam('allusers', $allUsers);
-	$view->setParam('allgroups', $allGroups);
-	$view->setParam('accessobject', $accessop);
+	$view->setParam('enableusersview', $settings->_enableUsersView);
 	$view->setParam('sortusersinlist', $settings->_sortUsersInList);
+	$view->setParam('accessobject', $accessop);
 	$view($_GET);
 	exit;
 }