From 03ef93df2cb399180bd87fdde84055159e2a397c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 5 Feb 2021 13:25:46 +0100 Subject: [PATCH] add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList() --- SeedDMS_Core/Core/inc.ClassFolder.php | 5 +++-- SeedDMS_Core/package.xml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php index 32b1fbbfb..4ca28739c 100644 --- a/SeedDMS_Core/Core/inc.ClassFolder.php +++ b/SeedDMS_Core/Core/inc.ClassFolder.php @@ -1541,10 +1541,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { * notification for the folder * * @param integer $type type of notification (not yet used) + * @param bool $incdisabled set to true if disabled user shall be included * @return SeedDMS_Core_User[]|SeedDMS_Core_Group[]|bool array with a the elements 'users' and 'groups' which * contain a list of users and groups. */ - function getNotifyList($type=0) { /* {{{ */ + function getNotifyList($type=0, $incdisabled=false) { /* {{{ */ if (empty($this->_notifyList)) { $db = $this->_dms->getDB(); @@ -1558,7 +1559,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object { { if ($row["userID"] != -1) { $u = $this->_dms->getUser($row["userID"]); - if($u && !$u->isDisabled()) + if($u && (!$u->isDisabled() || $incdisabled)) array_push($this->_notifyList["users"], $u); } else {//if ($row["groupID"] != -1) $g = $this->_dms->getGroup($row["groupID"]); diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 0135ade5b..bd45f9e19 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -28,6 +28,7 @@ - add SeedDMS_Core_User->isType() and SeedDMS_Core_Group->isType() - add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS() - add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents +- add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()