From 9bde006b4dbf279dd904bc9cf9898d30acff08f6 Mon Sep 17 00:00:00 2001 From: Wytze van der Raay Date: Sat, 13 Oct 2012 13:53:59 +0000 Subject: [PATCH] Fix for https://bugs.cacert.org/view.php?id=1091 "Improve message to assurer" --- includes/mysql.php.sample | 2 +- www/wot.php | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/includes/mysql.php.sample b/includes/mysql.php.sample index ff5cfc3..eb86401 100644 --- a/includes/mysql.php.sample +++ b/includes/mysql.php.sample @@ -28,7 +28,7 @@ function sendmail($to, $subject, $message, $from, $replyto = "", $toname = "", $fromname = "", $errorsto = "returns@cacert.org", $extra="") { - $lines = explode('\n', $message); + $lines = explode("\n", $message); $message = ""; foreach($lines as $line) { diff --git a/www/wot.php b/www/wot.php index bf5d301..2878534 100644 --- a/www/wot.php +++ b/www/wot.php @@ -442,8 +442,36 @@ $iecho= "c"; where `to`='".$user['id']."' group by `to` HAVING SUM(`points`) > 0")); if($points > 0) { - sendmail($user['email'], "[CAcert.org] ".$_REQUEST['subject'], $_REQUEST['message'], - $_SESSION['profile']['email'], "", "", $_SESSION['profile']['fname']." ".$_SESSION['profile']['lname']); + $my_translation = L10n::get_translation(); + L10n::set_translation($user['language']); + + $subject = "[CAcert.org] ".sprintf(_("Message from %s"), + $_SESSION['profile']['fname']); + + $body = sprintf(_("Hi %s,"), $user['fname'])."\n\n"; + $body .= sprintf(_("%s %s has sent you a message via the ". + "contact an Assurer form on CAcert.org."), + $_SESSION['profile']['fname'], + $_SESSION['profile']['lname'])."\n\n"; + $body .= sprintf(_("Subject: %s"), $_REQUEST['subject'])."\n"; + $body .= _("Message:")."\n"; + $body .= $_REQUEST['message']."\n\n"; + $body .= "------------------------------------------------\n\n"; + $body .= _("Please note, that this is NOT a message on behalf ". + "of CAcert but another CAcert community member. If ". + "you suspect that the contact form might have been ". + "abused, please write to support@cacert.org")."\n\n"; + $body .= _("Best regards")."\n"; + $body .= _("Your CAcert Community"); + + sendmail($user['email'], $subject, $body, + $_SESSION['profile']['email'], //from + "", //replyto + "", //toname + $_SESSION['profile']['fname']." ". + $_SESSION['profile']['lname']); //fromname + + L10n::set_translation($my_translation); showheader(_("My CAcert.org Account!"));?>