diff --git a/includes/account.php b/includes/account.php index ee5d3f8..4faa0e5 100644 --- a/includes/account.php +++ b/includes/account.php @@ -124,9 +124,9 @@ exit; } $row = mysql_fetch_assoc($res); - $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n"; - $body .= _("You are receiving this email because you or someone else")."\n"; - $body .= _("has changed the default email on your account.")."\n\n"; + $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n"; + $body .= _("You are receiving this email because you or someone else ". + "has changed the default email on your account.")."\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); @@ -1352,9 +1352,9 @@ where `id`='".$_SESSION['profile']['id']."'"); echo '

', _("Pass Phrase Changed Successfully"), '

', "\n"; 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 .= _("You are receiving this email because you or someone else")."\n"; - $body .= _("has changed the password on your account.")."\n"; + $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n"; + $body .= _("You are receiving this email because you or someone else ". + "has changed the password on your account.")."\n\n"; $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'])); - $body = sprintf(_("Hi %s,"),$row['fname'])."\n"; - $body .= _("You are receiving this email because a CAcert administrator")."\n"; - $body .= _("has changed the password on your account.")."\n"; + $body = sprintf(_("Hi %s,"),$row['fname'])."\n\n"; + $body .= _("You are receiving this email because a CAcert administrator ". + "has changed the password on your account.")."\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); diff --git a/pages/account/13.php b/pages/account/13.php index e8dad73..c2b7cc5 100644 --- a/pages/account/13.php +++ b/pages/account/13.php @@ -25,18 +25,18 @@ $day = intval(substr($user['dob'], 8, 2)); $body = sprintf(_("Hi %s,"),$user['fname'])."\n\n"; - $body .= _("You receive this automatic mail since you yourself or")."\n"; - $body .= _("someone else looked up your secret questions and answers")."\n"; - $body .= _("for a forgotten password.")."\n\n"; - $body .= _("If it was you who looked up or changed that data, or clicked")."\n"; - $body .= _("through the menu in your account, everything is in best order and")."\n"; - $body .= _("you can ignore this mail.")."\n\n"; - $body .= _("But if you received this mail without a recognisable reason,")."\n"; - $body .= _("there is a danger that an unauthorised person accessed your")."\n"; - $body .= _("account, and you should promptly change your password and your")."\n"; - $body .= _("secret questions and answers.")."\n\n"; + $body .= _("You receive this automatic mail since you yourself or someone ". + "else looked up your secret questions and answers for a forgotten ". + "password.\n\n". + "If it was you who looked up or changed that data, or clicked ". + "through the menu in your account, everything is in best order ". + "and you can ignore this mail.\n\n". + "But if you received this mail without a recognisable reason, ". + "there is a danger that an unauthorised person accessed your ". + "account, and you should promptly change your password and your ". + "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"); ?> diff --git a/www/wot.php b/www/wot.php index 2878534..c6c0568 100644 --- a/www/wot.php +++ b/www/wot.php @@ -333,12 +333,16 @@ $iecho= "c"; 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 to become an assurer try the")." "; - $body .= _("Assurer Challenge")." ( 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 .= _("You have at least 100 Assurance Points. If you want ". + "to become an assurer try the Assurer Challenge"). + " ( 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"; $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"; }