diff --git a/includes/account.php b/includes/account.php index 4fe9a8a..39b8a0f 100644 --- a/includes/account.php +++ b/includes/account.php @@ -133,7 +133,7 @@ $body .= "http://$hostname/verify.php?type=email&emailid=$emailid&hash=$hash\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($email, "[CAcert.org] "._("Email Probe"), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($email, "[CAcert.org] "._("Email Probe"), $body, "From: CAcacert-Support "); showheader(_("My CAcert.org Account!")); printf(_("The email address '%s' has been added to the system, however before any certificates for this can be issued you need to open the link in a browser that has been sent to your email address."), $email); @@ -446,7 +446,7 @@ $body .= "http://$hostname/verify.php?type=domain&domainid=$domainid&hash=$hash\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($authaddy, "[CAcert.org] "._("Email Probe"), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($authaddy, "[CAcert.org] "._("Email Probe"), $body, "From: CAcert-Support "); showheader(_("My CAcert.org Account!")); printf(_("The domain '%s' has been added to the system, however before any certificates for this can be issued you need to open the link in a browser that has been sent to your email address."), $_SESSION['_config']['domain']); diff --git a/scripts/clientcerts.php b/scripts/clientcerts.php index bbf1b94..a8491d0 100755 --- a/scripts/clientcerts.php +++ b/scripts/clientcerts.php @@ -65,7 +65,7 @@ $body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]); $body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support "); } } @@ -114,7 +114,7 @@ $body .= sprintf(_("You can collect your certificate for %s by going to the following location:")."\n\n", $row[CN]); $body .= "https://www.cacert.org/account.php?id=6&cert=$row[id]\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($user[email], "[CAcert.org] "._("Client Certificate"), $body, "From: CAcert-Support "); } } @@ -139,7 +139,7 @@ $body = _("Hi")." $user[fname],\n\n"; $body .= sprintf(_("Your certificate for %s has been revoked, as per request.")."\n\n", $row[CN]); $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($user[email], "[CAcert.org] ".sprintf(_("Certificate for %s has been revoked"), $row['CN']), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($user[email], "[CAcert.org] ".sprintf(_("Certificate for %s has been revoked"), $row['CN']), $body, "From: CAcert-Support "); } $query = "select * from `orgemailcerts` where `crt_name`='' and `keytype`='NS'"; @@ -232,6 +232,6 @@ $body = _("Hi")." $user[fname],\n\n"; $body .= sprintf(_("Your certificate for %s has been revoked, as per request.")."\n\n", $row[CN]); $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($user[email], "[CAcert.org] ".sprintf(_("Certificate for %s has been revoked"), $row['CN']), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($user[email], "[CAcert.org] ".sprintf(_("Certificate for %s has been revoked"), $row['CN']), $body, "From: CAcert-Support "); } ?> diff --git a/scripts/servercerts.php b/scripts/servercerts.php index 150eb82..8f41a60 100755 --- a/scripts/servercerts.php +++ b/scripts/servercerts.php @@ -80,7 +80,7 @@ $body = _("Hi")." ".$user['fname'].",\n\n"; $body .= sprintf(_("Below you will find your certificate for %s.")."\n\n", $row['CN']); $body .= _("Best regards")."\n"._("CAcert.org Support!")."\n\n".$cert; - mail($user['email'], "[CAcert.org] "._("Server Certificate"), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($user['email'], "[CAcert.org] "._("Server Certificate"), $body, "From: CAcert-Support "); } } @@ -106,7 +106,7 @@ $body = _("Hi")." ".$user['fname'].",\n\n"; $body .= sprintf(_("Your certificate for %s has been revoked, as per request.")."\n\n", $row['CN']); $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($user['email'], "[CAcert.org] ".sprintf(_("Certificate for %s has been revoked"), $row['CN']), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($user['email'], "[CAcert.org] ".sprintf(_("Certificate for %s has been revoked"), $row['CN']), $body, "From: CAcert-Support "); } $query = "select * from `orgdomaincerts` where `crt_name`=''"; diff --git a/www/account.php b/www/account.php index ad9186b..28be401 100644 --- a/www/account.php +++ b/www/account.php @@ -23,7 +23,7 @@ } else if($oldid == 40 && $process == _("Send")) { $message = "From: $who\nEmail: $email\nSubject: $subject\n\nMessage:\n".$message; - mail("duane@cacert.org", "[CAcert.org] ".$subject, $message, "From: $email\nErrors-To: returns@cacert.org"); + mail("duane@cacert.org", "[CAcert.org] ".$subject, $message, "From: $email"); showheader(_("Welcome to CAcert.org")); echo _("Your message has been sent."); showfooter(); diff --git a/www/index.php b/www/index.php index 13216e6..b235e30 100644 --- a/www/index.php +++ b/www/index.php @@ -87,7 +87,7 @@ "---------------------------------------------------------------------\n"; mail("duane@cacert.org", "[CAcert.org] Requested Pass Phrase Change", $body, "From: '".$_SESSION['lostpw']['user']['fname']."' <".$_SESSION['lostpw']['user']['email'].">\n". - "Errors-To: returns@cacert.org\nFrom: Support "); + "From: CAcert-Support "); $_SESSION['_config']['errmsg'] = _("You failed to get all answers correct, system admins have been notified."); } else if($_SESSION['lostpw']['pw1'] != $_SESSION['lostpw']['pw2'] || $_SESSION['lostpw']['pw1'] == "") { $_SESSION['_config']['errmsg'] = _("New Pass Phrases specified don't match or were blank."); @@ -304,7 +304,7 @@ $body .= "http://$hostname/verify.php?type=email&emailid=$emailid&hash=$hash\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); - mail($_SESSION['signup']['email'], "[CAcert.org] "._("Mail Probe"), $body, "From: Support \nErrors-To: returns@cacert.org"); + mail($_SESSION['signup']['email'], "[CAcert.org] "._("Mail Probe"), $body, "From: CAcert-Support "); } } @@ -327,7 +327,7 @@ { $message = "From: $who\nEmail: $email\nSubject: $subject\n\nMessage:\n".$message; - mail("duane@cacert.org", "[CAcert.org] ".$subject, $message, "From: $email\nErrors-To: returns@cacert.org"); + mail("duane@cacert.org", "[CAcert.org] ".$subject, $message, "From: $email"); showheader(_("Welcome to CAcert.org")); echo _("Your message has been sent."); showfooter(); diff --git a/www/wot.php b/www/wot.php index 7bf2602..f3c0b10 100644 --- a/www/wot.php +++ b/www/wot.php @@ -227,7 +227,7 @@ $body .= _("Best Regards")."\n"; $body .= _("CAcert Support Team"); - mail($_SESSION['_config']['notarise']['email'], "[CAcert.org] "._("You've been Notarised."), $body, "Errors-To: returns@cacert.org\nfrom: \"CAcert Support\" "); + mail($_SESSION['_config']['notarise']['email'], "[CAcert.org] "._("You've been Notarised."), $body, "From: CAcert-Support "); putenv("LANG=".$_SESSION['_config']['language']); setlocale(LC_ALL, $_SESSION['_config']['language']); @@ -237,7 +237,7 @@ $body .= _("Best Regards")."\n"; $body .= _("CAcert Support Team"); - mail($_SESSION['profile']['email'], "[CAcert.org] "._("You've Notarised Another Member."), $body, "Errors-To: returns@cacert.org\nfrom: \"CAcert Support\" "); + mail($_SESSION['profile']['email'], "[CAcert.org] "._("You've Notarised Another Member."), $body, "From: CAcert-Support "); showheader(_("My CAcert.org Account!")); echo "

"._("Shortly you and the person you were notarising will receive and email confirmation, there is no action on your behalf required to complete this.")."

"; @@ -269,7 +269,6 @@ $body = $_POST['message']; $subject = $_POST['subject']; mail($_SESSION['_config']['user']['email'], "[CAcert.org] ".$_POST['subject'], $_POST['message'], - "Errors-To: returns@cacert.org\n". "From: '".$_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']."' <". $_SESSION['profile']['email'].">"); showheader(_("My CAcert.org Account!"));