gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 21:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

getNotifyList() returns only users which are not disabled

Browse Source
This commit is contained in:
Uwe Steinmann 2017-07-27 22:10:44 +02:00
parent 7576bbf298
commit cb17de44fc
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -967,10 +967,15 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$this->_notifyList = array("groups" => array(), "users" => array()); $this->_notifyList = array("groups" => array(), "users" => array());
foreach ($resArr as $row) foreach ($resArr as $row)
{ {
if ($row["userID"] != -1) if ($row["userID"] != -1) {
array_push($this->_notifyList["users"], $this->_dms->getUser($row["userID"]) ); $u = $this->_dms->getUser($row["userID"]);
else //if ($row["groupID"] != -1) if($u && !$u->isDisabled())
array_push($this->_notifyList["groups"], $this->_dms->getGroup($row["groupID"]) ); array_push($this->_notifyList["users"], $u);
} else { //if ($row["groupID"] != -1)
$g = $this->_dms->getGroup($row["groupID"]);
if($g)
array_push($this->_notifyList["groups"], $g);
}
} }
} }
return $this->_notifyList; return $this->_notifyList;

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

@ -1245,10 +1245,15 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
$this->_notifyList = array("groups" => array(), "users" => array()); $this->_notifyList = array("groups" => array(), "users" => array());
foreach ($resArr as $row) foreach ($resArr as $row)
{ {
if ($row["userID"] != -1) if ($row["userID"] != -1) {
array_push($this->_notifyList["users"], $this->_dms->getUser($row["userID"]) ); $u = $this->_dms->getUser($row["userID"]);
else //if ($row["groupID"] != -1) if($u && !$u->isDisabled())
array_push($this->_notifyList["groups"], $this->_dms->getGroup($row["groupID"]) ); array_push($this->_notifyList["users"], $u);
} else {//if ($row["groupID"] != -1)
$g = $this->_dms->getGroup($row["groupID"]);
if($g)
array_push($this->_notifyList["groups"], $g);
}
} }
} }
return $this->_notifyList; return $this->_notifyList;