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

Use CRLF to separate headers in mail()

Browse source 
This is the correct delimiter for mail headers according to the PHP
documentation and RFC 2822.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-02-10 20:40:52 +01:00
parent 9864988517
commit 16c3a86193
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -652,7 +652,10 @@ function send_resetkey($email, $body) {
$body .= "\n\n". $body .= "\n\n".
"{$AUR_LOCATION}/" . get_uri('/passreset/') . "?". "{$AUR_LOCATION}/" . get_uri('/passreset/') . "?".
"resetkey={$resetkey}"; "resetkey={$resetkey}";
$headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR"; $headers = "Reply-to: nobody@archlinux.org\r\n" .
"From: aur-notify@archlinux.org\r\n" .
"X-Mailer: PHP\r\n" .
"X-MimeOLE: Produced By AUR";
@mail($email, 'AUR Password Reset', $body, $headers); @mail($email, 'AUR Password Reset', $body, $headers);
} }
} }

15
web/lib/pkgfuncs.inc.php
View file

@ -295,7 +295,10 @@ function add_package_comment($pkgid, $uid, $comment) {
. "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button."; . "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button.";
$body = wordwrap($body, 70); $body = wordwrap($body, 70);
$bcc = implode(', ', $bcc); $bcc = implode(', ', $bcc);
$headers = "Bcc: $bcc\nReply-to: nobody@archlinux.org\nFrom: aur-notify@archlinux.org\nX-Mailer: AUR\n"; $headers = "Bcc: $bcc\r\n" .
"Reply-to: nobody@archlinux.org\r\n" .
"From: aur-notify@archlinux.org\r\n" .
"X-Mailer: AUR";
@mail('undisclosed-recipients: ;', "AUR Comment for " . $row['Name'], $body, $headers); @mail('undisclosed-recipients: ;', "AUR Comment for " . $row['Name'], $body, $headers);
} }
} }
@ -797,7 +800,10 @@ function pkg_flag($atype, $ids) {
while ($row = $result->fetch(PDO::FETCH_ASSOC)) { while ($row = $result->fetch(PDO::FETCH_ASSOC)) {
$body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . " [1]. You may view your package at:\n" . $AUR_LOCATION . get_pkg_uri($row['Name']) . "\n\n[1] - " . $AUR_LOCATION . get_user_uri($f_name); $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . " [1]. You may view your package at:\n" . $AUR_LOCATION . get_pkg_uri($row['Name']) . "\n\n[1] - " . $AUR_LOCATION . get_user_uri($f_name);
$body = wordwrap($body, 70); $body = wordwrap($body, 70);
$headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; $headers = "Reply-to: nobody@archlinux.org\r\n" .
"From: aur-notify@archlinux.org\r\n" .
"X-Mailer: PHP\r\n" .
"X-MimeOLE: Produced By AUR";
@mail($row['Email'], "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); @mail($row['Email'], "AUR Out-of-date Notification for ".$row['Name'], $body, $headers);
} }
} }
@ -903,7 +909,10 @@ function pkg_delete ($atype, $ids, $mergepkgid) {
} }
$body = wordwrap($body, 70); $body = wordwrap($body, 70);
$bcc = implode(', ', $bcc); $bcc = implode(', ', $bcc);
$headers = "Bcc: $bcc\nReply-to: nobody@archlinux.org\nFrom: aur-notify@archlinux.org\nX-Mailer: AUR\n"; $headers = "Bcc: $bcc\r\n" .
"Reply-to: nobody@archlinux.org\r\n" .
"From: aur-notify@archlinux.org\r\n" .
"X-Mailer: AUR";
@mail('undisclosed-recipients: ;', "AUR Package deleted: " . $pkgname, $body, $headers); @mail('undisclosed-recipients: ;', "AUR Package deleted: " . $pkgname, $body, $headers);
} }
} }