cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

Fix for https://bugs.cacert.org/view.php?id=860

Browse source 
"someone accessed your password and secret questions page, plz change pwd translation mixed and garbled, text is tanslated in TL"
This commit is contained in:
Wytze van der Raay 2012-11-01 13:57:40 +00:00
parent b553d02a5a
commit 27236c1388
3 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/account.php
View file

@ -124,9 +124,9 @@
exit; exit;
} }
$row = mysql_fetch_assoc($res); $row = mysql_fetch_assoc($res);
$body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n"; $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n";
$body .= _("You are receiving this email because you or someone else")."\n"; $body .= _("You are receiving this email because you or someone else ".
$body .= _("has changed the default email on your account.")."\n\n"; "has changed the default email on your account.")."\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!"); $body .= _("Best regards")."\n"._("CAcert.org Support!");
@ -1352,9 +1352,9 @@
where `id`='".$_SESSION['profile']['id']."'"); where `id`='".$_SESSION['profile']['id']."'");
echo '<h3>', _("Pass Phrase Changed Successfully"), '</h3>', "\n"; echo '<h3>', _("Pass Phrase Changed Successfully"), '</h3>', "\n";
echo _("Your Pass Phrase has been updated and your primary email account has been notified of the change."); echo _("Your Pass Phrase has been updated and your primary email account has been notified of the change.");
$body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n"; $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n";
$body .= _("You are receiving this email because you or someone else")."\n"; $body .= _("You are receiving this email because you or someone else ".
$body .= _("has changed the password on your account.")."\n"; "has changed the password on your account.")."\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!"); $body .= _("Best regards")."\n"._("CAcert.org Support!");
@ -2613,9 +2613,9 @@
printf(_("The password for %s has been updated successfully in the system."), sanitizeHTML($row['email'])); printf(_("The password for %s has been updated successfully in the system."), sanitizeHTML($row['email']));
$body = sprintf(_("Hi %s,"),$row['fname'])."\n"; $body = sprintf(_("Hi %s,"),$row['fname'])."\n\n";
$body .= _("You are receiving this email because a CAcert administrator")."\n"; $body .= _("You are receiving this email because a CAcert administrator ".
$body .= _("has changed the password on your account.")."\n"; "has changed the password on your account.")."\n\n";
$body .= _("Best regards")."\n"._("CAcert.org Support!"); $body .= _("Best regards")."\n"._("CAcert.org Support!");

22
pages/account/13.php
View file

@ -25,18 +25,18 @@
$day = intval(substr($user['dob'], 8, 2)); $day = intval(substr($user['dob'], 8, 2));
$body = sprintf(_("Hi %s,"),$user['fname'])."\n\n"; $body = sprintf(_("Hi %s,"),$user['fname'])."\n\n";
$body .= _("You receive this automatic mail since you yourself or")."\n"; $body .= _("You receive this automatic mail since you yourself or someone ".
$body .= _("someone else looked up your secret questions and answers")."\n"; "else looked up your secret questions and answers for a forgotten ".
$body .= _("for a forgotten password.")."\n\n"; "password.\n\n".
$body .= _("If it was you who looked up or changed that data, or clicked")."\n"; "If it was you who looked up or changed that data, or clicked ".
$body .= _("through the menu in your account, everything is in best order and")."\n"; "through the menu in your account, everything is in best order ".
$body .= _("you can ignore this mail.")."\n\n"; "and you can ignore this mail.\n\n".
$body .= _("But if you received this mail without a recognisable reason,")."\n"; "But if you received this mail without a recognisable reason, ".
$body .= _("there is a danger that an unauthorised person accessed your")."\n"; "there is a danger that an unauthorised person accessed your ".
$body .= _("account, and you should promptly change your password and your")."\n"; "account, and you should promptly change your password and your ".
$body .= _("secret questions and answers.")."\n\n"; "secret questions and answers.")."\n\n";
$body .= _("With kind regards,")."\n\n"._("CAcert Support"); $body .= _("Best regards")."\n"._("CAcert Support");
sendmail($user['email'], "[CAcert.org] "._("Email Notification"), $body, "support@cacert.org", "", "", "CAcert Support"); sendmail($user['email'], "[CAcert.org] "._("Email Notification"), $body, "support@cacert.org", "", "", "CAcert Support");
?> ?>

14
www/wot.php
View file

@ -333,12 +333,16 @@ $iecho= "c";
if(($drow['total'] + $newpoints) >= 100 && $newpoints > 0) if(($drow['total'] + $newpoints) >= 100 && $newpoints > 0)
{ {
// $body .= _("You now have over 100 points and can start assuring others.")."\n\n"; $body .= _("You have at least 100 Assurance Points. If you want ".
$body .= _("You have at least 100 Assurance Points, if you want to become an assurer try the")." "; "to become an assurer try the Assurer Challenge").
$body .= _("Assurer Challenge")." ( https://cats.cacert.org )\n\n"; " ( https://cats.cacert.org ).\n\n";
$body .= _("To make it easier for others in your area to find you, it's helpful to list yourself as an assurer (this is voluntary), as well as a physical location where you live or work the most. You can flag your account to be listed, and add a comment to the display by going to:")."\n\n"; $body .= _("To make it easier for others in your area to find ".
"you, it's helpful to list yourself as an assurer (this ".
"is voluntary), as well as a physical location where you ".
"live or work the most. You can flag your account to be ".
"listed, and add a comment to the display by going to:")."\n";
$body .= "https://www.cacert.org/wot.php?id=8\n\n"; $body .= "https://www.cacert.org/wot.php?id=8\n\n";
$body .= _("You can list your location by going to:")."\n\n"; $body .= _("You can list your location by going to:")."\n";
$body .= "https://www.cacert.org/wot.php?id=13\n\n"; $body .= "https://www.cacert.org/wot.php?id=13\n\n";
} }