do not add uploader and reviewer to recipients when added by group

This commit is contained in:
Uwe Steinmann 2018-02-01 08:28:56 +01:00
parent e7bec65b89
commit 3ad9fe9743
3 changed files with 15 additions and 6 deletions

View File

@ -292,10 +292,13 @@ if (isset($_POST["grpIndRecipients"])) {
foreach ($_POST["grpIndRecipients"] as $grp) { foreach ($_POST["grpIndRecipients"] as $grp) {
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 approvers */
if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
$recipients["i"][] = $member->getID(); $recipients["i"][] = $member->getID();
} }
} }
}
} }
$docsource = 'upload'; $docsource = 'upload';

View File

@ -195,11 +195,14 @@ else
foreach ($_POST["grpIndRecipients"] as $grp) { foreach ($_POST["grpIndRecipients"] as $grp) {
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 approvers */
if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
$recipients["i"][] = $member->getID(); $recipients["i"][] = $member->getID();
} }
} }
} }
}
if(isset($_POST["attributes"]) && $_POST["attributes"]) { if(isset($_POST["attributes"]) && $_POST["attributes"]) {
$attributes = $_POST["attributes"]; $attributes = $_POST["attributes"];

View File

@ -307,11 +307,14 @@ default:
foreach ($_POST["grpIndRecipients"] as $grp) { foreach ($_POST["grpIndRecipients"] as $grp) {
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 approvers */
if($member->getID() != $user->getID() && !in_array($member->getID(), $approvers['i']))
$recipients["i"][] = $member->getID(); $recipients["i"][] = $member->getID();
} }
} }
} }
}
if(isset($_POST["attributes_version"]) && $_POST["attributes_version"]) { if(isset($_POST["attributes_version"]) && $_POST["attributes_version"]) {
$attributes = $_POST["attributes_version"]; $attributes = $_POST["attributes_version"];