Use Cc instead of Bcc in request notifications

Add the request creator and the current package maintainer to Cc instead
of Bcc when sending notification emails for package requests. This
allows users to forward any discussion to both of them by using the
"Group Reply" function of their MUA.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-07-16 10:50:49 +02:00
parent bfb253ef72
commit 42d927366a

View file

@ -125,7 +125,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
* Send e-mail notifications.
* TODO: Move notification logic to separate function where it belongs.
*/
$bcc = array(pkgreq_get_creator_email($request_id));
$cc = array(pkgreq_get_creator_email($request_id));
$q = "SELECT Users.Email ";
$q.= "FROM Users INNER JOIN PackageBases ";
@ -133,7 +133,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
$q.= "WHERE PackageBases.ID = " . intval($base_id);
$result = $dbh->query($q);
if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
$bcc[] = $row['Email'];
$cc[] = $row['Email'];
}
$q = "SELECT Name FROM PackageBases WHERE ID = ";
@ -156,7 +156,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
$body = wordwrap($body, 70);
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Bcc: " . implode(', ', $bcc) . "\r\n";
"Cc: " . implode(', ', $cc) . "\r\n";
$thread_id = "<pkg-request-" . $request_id . "@aur.archlinux.org>";
$headers .= "From: notify@aur.archlinux.org\r\n" .
"Message-ID: $thread_id\r\n" .
@ -209,7 +209,7 @@ function pkgreq_close($id, $reason, $comments) {
* Send e-mail notifications.
* TODO: Move notification logic to separate function where it belongs.
*/
$bcc = array(pkgreq_get_creator_email($id));
$cc = array(pkgreq_get_creator_email($id));
$q = "SELECT Users.Email ";
$q.= "FROM Users INNER JOIN PackageBases ";
@ -219,7 +219,7 @@ function pkgreq_close($id, $reason, $comments) {
$q.= "WHERE PackageRequests.ID = " . $id;
$result = $dbh->query($q);
if ($row = $result->fetch(PDO::FETCH_ASSOC)) {
$bcc[] = $row['Email'];
$cc[] = $row['Email'];
}
/*
@ -240,7 +240,7 @@ function pkgreq_close($id, $reason, $comments) {
$body = wordwrap($body, 70);
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Bcc: " . implode(', ', $bcc) . "\r\n";
"Cc: " . implode(', ', $cc) . "\r\n";
$thread_id = "<pkg-request-" . $id . "@aur.archlinux.org>";
$headers .= "From: notify@aur.archlinux.org\r\n" .
"In-Reply-To: $thread_id\r\n" .