external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notify: Do not pass notification texts via pipes

Browse source 
Directly retrieve comments from the database instead of additionally
passing them via stdin.

Fixes FS#46742.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
This commit is contained in:
Lukas Fleischer 2015-12-12 18:28:42 +01:00
parent 5931d5ceec
commit e45609cf66
4 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/lib/acctfuncs.inc.php
View file

@ -1277,11 +1277,10 @@ function account_set_ssh_keys($uid, $ssh_keys, $ssh_fingerprints) {
* Invoke the email notification script.
*
* @param string $params Command line parameters for the script.
* @param string $text Text to pass via stdin.
*
* @return void
*/
function notify($params, $text='') {
function notify($params) {
$cmd = config_get('notifications', 'notify-cmd');
foreach ($params as $param) {
$cmd .= ' ' . escapeshellarg($param);
@ -1299,7 +1298,6 @@ function notify($params, $text='') {
return false;
}
fwrite($pipes[0], $text);
fclose($pipes[0]);
fclose($pipes[1]);
fclose($pipes[2]);

5
web/lib/pkgbasefuncs.inc.php
View file

@ -100,8 +100,9 @@ function pkgbase_add_comment($base_id, $uid, $comment) {
$q.= intval($base_id) . ", " . $uid . ", ";
$q.= $dbh->quote($comment) . ", UNIX_TIMESTAMP())";
$dbh->exec($q);
$comment_id = $dbh->lastInsertId();
notify(array('comment', $uid, $base_id), $comment);
notify(array('comment', $uid, $base_id, $comment_id));
return array(true, __('Comment has been added.'));
}
@ -401,7 +402,7 @@ function pkgbase_flag($base_ids, $comment) {
$dbh->exec($q);
foreach ($base_ids as $base_id) {
notify(array('flag', $uid, $base_id), $comment);
notify(array('flag', $uid, $base_id));
}
return array(true, __("The selected packages have been flagged out-of-date."));

4
web/lib/pkgreqfuncs.inc.php
View file

@ -158,7 +158,7 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
if ($type === 'merge') {
$params[] = $merge_into;
}
notify($params, $comments);
notify($params);
$auto_orphan_age = config_get('options', 'auto_orphan_age');
$auto_delete_age = config_get('options', 'auto_delete_age');
@ -233,7 +233,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
$dbh->exec($q);
/* Send e-mail notifications. */
notify(array('request-close', $uid, $id, $reason), $comments);
notify(array('request-close', $uid, $id, $reason));
return array(true, __("Request closed successfully."));
}