diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/account.php | 2 | ||||
| -rw-r--r-- | www/api/ccsr.php | 3 | ||||
| -rw-r--r-- | www/wot.php | 32 |
3 files changed, 34 insertions, 3 deletions
diff --git a/www/account.php b/www/account.php index d1dd695..0b32c2c 100644 --- a/www/account.php +++ b/www/account.php @@ -47,7 +47,7 @@ $message = "From: $who\nEmail: $email\nSubject: $subject\n\nMessage:\n".$message; - sendmail("cacert-support@lists.cacert.org, $email", "[website form email]: ".$subject, $message, "website-form@cacert.org", "cacert-support@lists.cacert.org, $email", "", "CAcert Website"); + sendmail("cacert-support@lists.cacert.org", "[website form email]: ".$subject, $message, "website-form@cacert.org", "cacert-support@lists.cacert.org, $email", "", "CAcert Website"); showheader(_("Welcome to CAcert.org")); echo _("Your message has been sent to the general support list."); diff --git a/www/api/ccsr.php b/www/api/ccsr.php index a4ec71e..7efdf8d 100644 --- a/www/api/ccsr.php +++ b/www/api/ccsr.php @@ -15,6 +15,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +require_once '../../includes/lib/check_weak_key.php'; + $username = mysql_real_escape_string($_REQUEST['username']); $password = mysql_real_escape_string($_REQUEST['password']); diff --git a/www/wot.php b/www/wot.php index ffc097b..c6c0568 100644 --- a/www/wot.php +++ b/www/wot.php @@ -446,8 +446,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!"));?> <p> |