summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2014-05-22 15:42:46 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-05-22 15:43:41 +0200
commit839bff3761cc9eb27010c6fe1e37cf4edcbf3f01 (patch)
treee94e131856b2022cc3bee437086dc662a7fb9486
parent02e7df7631e0ec08cc3890a0d4202ed6f5331585 (diff)
downloadaur-839bff3761cc9eb27010c6fe1e37cf4edcbf3f01.tar.gz
aur-839bff3761cc9eb27010c6fe1e37cf4edcbf3f01.tar.xz
Use aur.archlinux.org in sender email addresses
Consistently use the following headers in notification emails: Reply-to: noreply@aur.archlinux.org From: notify@aur.achlinux.org Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
-rw-r--r--web/lib/acctfuncs.inc.php4
-rw-r--r--web/lib/pkgbasefuncs.inc.php12
2 files changed, 8 insertions, 8 deletions
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index 6ac34a0d..5b907dc6 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -656,8 +656,8 @@ function send_resetkey($email, $subject, $body) {
"resetkey={$resetkey}";
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n";
- "Reply-to: nobody@archlinux.org\r\n" .
- "From: aur-notify@archlinux.org\r\n" .
+ "Reply-to: noreply@aur.archlinux.org\r\n" .
+ "From: notify@aur.achlinux.org\r\n" .
"X-Mailer: PHP\r\n" .
"X-MimeOLE: Produced By AUR";
@mail($email, $subject, $body, $headers);
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 34ff302a..9f80ef26 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -137,8 +137,8 @@ function pkgbase_add_comment($base_id, $uid, $comment) {
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Bcc: $bcc\r\n" .
- "Reply-to: nobody@archlinux.org\r\n" .
- "From: aur-notify@archlinux.org\r\n" .
+ "Reply-to: noreply@aur.archlinux.org\r\n" .
+ "From: notify@aur.archlinux.org\r\n" .
"In-Reply-To: $thread_id\r\n" .
"References: $thread_id\r\n" .
"X-Mailer: AUR";
@@ -385,8 +385,8 @@ function pkgbase_flag($atype, $base_ids) {
$body = wordwrap($body, 70);
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
- "Reply-to: nobody@archlinux.org\r\n" .
- "From: aur-notify@archlinux.org\r\n" .
+ "Reply-to: noreply@aur.archlinux.org\r\n" .
+ "From: notify@aur.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);
@@ -497,8 +497,8 @@ function pkgbase_delete ($atype, $base_ids, $merge_base_id) {
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Bcc: $bcc\r\n" .
- "Reply-to: nobody@archlinux.org\r\n" .
- "From: aur-notify@archlinux.org\r\n" .
+ "Reply-to: noreply@aur.archlinux.org\r\n" .
+ "From: notify@aur.archlinux.org\r\n" .
"X-Mailer: AUR";
@mail('undisclosed-recipients: ;', "AUR Package deleted: " . $pkgbase_name, $body, $headers);
}