When sending notification emails after closing a request, be explicit about whether the request has been accepted or not. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- web/html/pkgbase.php | 2 +- web/lib/pkgbasefuncs.inc.php | 4 ++-- web/lib/pkgreqfuncs.inc.php | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 6fdaf40..adc6118 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -99,7 +99,7 @@ if (check_token()) { } elseif (current_action("do_FileRequest")) { list($ret, $output) = pkgreq_file($ids, $_POST['type'], $_POST['merge_into'], $_POST['comments']); } elseif (current_action("do_CloseRequest")) { - list($ret, $output) = pkgreq_close($_POST['reqid']); + list($ret, $output) = pkgreq_close($_POST['reqid'], false); } if (isset($_REQUEST['comment'])) { diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 32c2d9b..0ee2c31 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -540,7 +540,7 @@ function pkgbase_delete ($atype, $base_ids, $merge_base_id, $via) { $dbh->exec($q); if ($via) { - pkgreq_close(intval($via)); + pkgreq_close(intval($via), true); } return array(true, __("The selected packages have been deleted.")); @@ -598,7 +598,7 @@ function pkgbase_adopt ($atype, $base_ids, $action=true, $via) { $dbh->exec($q); if ($via) { - pkgreq_close(intval($via)); + pkgreq_close(intval($via), true); } if ($action) { diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index 69ba08d..26d543e 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -126,10 +126,11 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { * @global string $AUR_LOCATION The AUR's URL used for notification e-mails * @global string $AUR_REQUEST_ML The request notification mailing list * @param int $id The package request to close + * @param bool $accepted True if the request has been accepted, false otherwise * * @return array Tuple of success/failure indicator and error message */ -function pkgreq_close($id) { +function pkgreq_close($id, $accepted) { global $AUR_LOCATION; global $AUR_REQUEST_ML; @@ -167,7 +168,9 @@ function pkgreq_close($id) { * user who posted the comment was in. */ $username = username_from_sid($_COOKIE['AURSID']); - $body = $username . " [1] closed request #" . intval($id) . ".\n\n" . + $body = "Request #" . intval($id) . " has been " . + ($accepted ? "accepted" : "closed") . " by " . + $username . " [1].\n\n" . "[1] " . $AUR_LOCATION . get_user_uri($username) . "\n"; $body = wordwrap($body, 70); $headers = "MIME-Version: 1.0\r\n" . -- 2.0.1