mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-08 20:46:05 +00:00
add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()
This commit is contained in:
parent
8543d62ce4
commit
03ef93df2c
|
@ -1541,10 +1541,11 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
|
||||||
* notification for the folder
|
* notification for the folder
|
||||||
*
|
*
|
||||||
* @param integer $type type of notification (not yet used)
|
* @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
|
* @return SeedDMS_Core_User[]|SeedDMS_Core_Group[]|bool array with a the elements 'users' and 'groups' which
|
||||||
* contain a list of users and groups.
|
* contain a list of users and groups.
|
||||||
*/
|
*/
|
||||||
function getNotifyList($type=0) { /* {{{ */
|
function getNotifyList($type=0, $incdisabled=false) { /* {{{ */
|
||||||
if (empty($this->_notifyList)) {
|
if (empty($this->_notifyList)) {
|
||||||
$db = $this->_dms->getDB();
|
$db = $this->_dms->getDB();
|
||||||
|
|
||||||
|
@ -1558,7 +1559,7 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
|
||||||
{
|
{
|
||||||
if ($row["userID"] != -1) {
|
if ($row["userID"] != -1) {
|
||||||
$u = $this->_dms->getUser($row["userID"]);
|
$u = $this->_dms->getUser($row["userID"]);
|
||||||
if($u && !$u->isDisabled())
|
if($u && (!$u->isDisabled() || $incdisabled))
|
||||||
array_push($this->_notifyList["users"], $u);
|
array_push($this->_notifyList["users"], $u);
|
||||||
} else {//if ($row["groupID"] != -1)
|
} else {//if ($row["groupID"] != -1)
|
||||||
$g = $this->_dms->getGroup($row["groupID"]);
|
$g = $this->_dms->getGroup($row["groupID"]);
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
- add SeedDMS_Core_User->isType() and SeedDMS_Core_Group->isType()
|
- add SeedDMS_Core_User->isType() and SeedDMS_Core_Group->isType()
|
||||||
- add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS()
|
- add SeedDMS_Core_User->getDMS() and SeedDMS_Core_Group->getDMS()
|
||||||
- add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents
|
- add new parameter to SeedDMS_Core_DMS->getDocumentList() for skipping expired documents
|
||||||
|
- add parameter $incdisabled to SeedDMS_Core_Folder::getNotifyList()
|
||||||
</notes>
|
</notes>
|
||||||
<contents>
|
<contents>
|
||||||
<dir baseinstalldir="SeedDMS" name="/">
|
<dir baseinstalldir="SeedDMS" name="/">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user