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

take out reviewers and uploaders from recipients

Browse Source
This commit is contained in:
Uwe Steinmann 2018-02-20 17:29:16 +01:00
parent 5e478d749d
commit af066bb15b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
op/op.SetRecipients.php
View File

@ -85,6 +85,16 @@ foreach ($receiptStatus as $i=>$rs) {
} }
} }
/* Get List of ind. reviewers, because they are taken out from the receivers
* if added as group.
*/
$reviewStatus = $latestContent->getReviewStatus();
$reviewerids = [];
foreach ($reviewStatus as $r) {
if($r["type"] == 0 && $r["status"] > -2) {
$reviewerids[] = $r['required'];
}
}
// Get the list of proposed recipients, stripping out any duplicates. // Get the list of proposed recipients, stripping out any duplicates.
$pIndRev = (isset($_POST["indRecipients"]) ? array_values(array_unique($_POST["indRecipients"])) : array()); $pIndRev = (isset($_POST["indRecipients"]) ? array_values(array_unique($_POST["indRecipients"])) : array());
// Retrieve the list of recipient groups whose members become individual recipients // Retrieve the list of recipient groups whose members become individual recipients
@ -93,6 +103,8 @@ if (isset($_POST["grpIndRecipients"])) {
if($group = $dms->getGroup($grp)) { if($group = $dms->getGroup($grp)) {
$members = $group->getUsers(); $members = $group->getUsers();
foreach($members as $member) { foreach($members as $member) {
/* Do not add the uploader itself and reviewers */
if(!$settings->_enableFilterReceipt || ($member->getID() != $latestContent->getUser()->getID() && !in_array($member->getID(), $reviewerids)))
if(!in_array($member->getID(), $pIndRev)) if(!in_array($member->getID(), $pIndRev))
$pIndRev[] = $member->getID(); $pIndRev[] = $member->getID();
} }