gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sync call of getReadAccessList() with SeedDMS_Core_Document::getReadAccessList()

Browse Source
This commit is contained in:
Uwe Steinmann 2020-12-12 16:27:01 +01:00
parent f02e0ca977
commit f2c376cadc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SeedDMS_Core/Core/inc.ClassFolder.php
View File

@ -1778,11 +1778,12 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
* administrators and the owner of the folder unless $listadmin resp. * administrators and the owner of the folder unless $listadmin resp.
* $listowner is set to true. * $listowner is set to true.
* *
* @param bool|int $listadmin if set to true any admin will be listed too * @param boolean $listadmin if set to true any admin will be listed too
* @param bool|int $listowner if set to true the owner will be listed too * @param boolean $listowner if set to true the owner will be listed too
* @param boolean $listguest if set to true any guest will be listed too
* @return array list of users and groups * @return array list of users and groups
*/ */
function getReadAccessList($listadmin=0, $listowner=0) { /* {{{ */ function getReadAccessList($listadmin=0, $listowner=0, $listguest=0) { /* {{{ */
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
if (!isset($this->_readAccessList)) { if (!isset($this->_readAccessList)) {
@ -1817,7 +1818,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
$user = $userAccess->getUser(); $user = $userAccess->getUser();
if (!$listadmin && $user->isAdmin()) continue; if (!$listadmin && $user->isAdmin()) continue;
if (!$listowner && $user->getID() == $this->_ownerID) continue; if (!$listowner && $user->getID() == $this->_ownerID) continue;
if ($user->isGuest()) continue; if (!$listguest && $user->isGuest()) continue;
$userIDs .= (strlen($userIDs)==0 ? "" : ", ") . $userAccess->getUserID(); $userIDs .= (strlen($userIDs)==0 ? "" : ", ") . $userAccess->getUserID();
} }
@ -1844,7 +1845,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
(strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))"). (strlen($userIDs) == 0 ? "" : " OR (`tblUsers`.`id` IN (". $userIDs ."))").
") ORDER BY `login`"; ") ORDER BY `login`";
} }
/* If default access is equal or greate then read, $userIDs and /* If default access is equal or greater than M_READ, $userIDs and
* $groupIDs contains a list of user without read access * $groupIDs contains a list of user without read access
*/ */
else { else {