From 3ad9fe9743c1fee56290cf7f61e4d87a2f1bdaae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 1 Feb 2018 08:28:56 +0100
Subject: [PATCH] do not add uploader and reviewer to recipients when added by
 group

---
 op/op.AddDocument.php     | 7 +++++--
 op/op.CheckInDocument.php | 7 +++++--
 op/op.UpdateDocument.php  | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index b2712175b..463e7cc0a 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -292,8 +292,11 @@ if (isset($_POST["grpIndRecipients"])) {
 	foreach ($_POST["grpIndRecipients"] as $grp) {
 		if($group = $dms->getGroup($grp)) {
 			$members = $group->getUsers();
-			foreach($members as $member)
-				$recipients["i"][] = $member->getID();
+			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();
+			}
 		}
 	}
 }
diff --git a/op/op.CheckInDocument.php b/op/op.CheckInDocument.php
index 8d23a9408..1269e732d 100644
--- a/op/op.CheckInDocument.php
+++ b/op/op.CheckInDocument.php
@@ -195,8 +195,11 @@ else
 		foreach ($_POST["grpIndRecipients"] as $grp) {
 			if($group = $dms->getGroup($grp)) {
 				$members = $group->getUsers();
-				foreach($members as $member)
-					$recipients["i"][] = $member->getID();
+				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();
+				}
 			}
 		}
 	}
diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php
index c1bd55759..e64dbc1fd 100644
--- a/op/op.UpdateDocument.php
+++ b/op/op.UpdateDocument.php
@@ -307,8 +307,11 @@ default:
 		foreach ($_POST["grpIndRecipients"] as $grp) {
 			if($group = $dms->getGroup($grp)) {
 				$members = $group->getUsers();
-				foreach($members as $member)
-					$recipients["i"][] = $member->getID();
+				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();
+				}
 			}
 		}
 	}