summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-02-20 15:52:30 +0100
committerMichael Tänzer <neo@nhng.de>2013-02-20 15:52:30 +0100
commit805f9a155a97508c48e7185e5acc4124235b7472 (patch)
tree81a94cd8ea39d9b7ef5465ce63a4b32046d44254 /www
parent63738c4b44d52d40a5b4d9230d54d70c26c7dc05 (diff)
downloadcacert-devel-805f9a155a97508c48e7185e5acc4124235b7472.tar.gz
cacert-devel-805f9a155a97508c48e7185e5acc4124235b7472.tar.xz
cacert-devel-805f9a155a97508c48e7185e5acc4124235b7472.zip
bug 1112: Fix things popped up in review:
- whitespace/indentation - require vs. include and possible issue with relative path - wording - intval($id) - unnecessary change of language while the text is not sent through gettext anyway - do not use mysql_escape_string on email body - make strings easier to translate Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'www')
-rw-r--r--www/wot.php66
1 files changed, 30 insertions, 36 deletions
diff --git a/www/wot.php b/www/wot.php
index 2ffaf7b..36d25b9 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -130,39 +130,35 @@ function send_reminder()
if($oldid == 4)
{
- $my_translation = L10n::get_translation();
- L10n::set_translation($_SESSION['_config']['notarise']['language']);
- if ($_POST['ttp']!='') {
- //This mail does not need to be translated
- $body = "Hi TTP adminstrators,\n\n";
- $body .= "User ".$_SESSION['profile']['fname']." ".
- $_SESSION['profile']['lname']." with email address '".
- $_SESSION['profile']['email']."' is requesting a TTP assurances for ".
- mysql_escape_string(stripslashes($_POST['country'])).".\n\n";
- if ($_POST['ttptopup']=='1') {
- $body .= "The user is requesting also the TTP TOPUP.\n\n";
- }else{
- $body .= "The user is NOT requesting the TTP TOPUP.\n\n";
- }
- $body .= "The user received ".(int)$_SESSION['profile']['points']." assurance points up today.\n\n";
- $body .= "Please start the TTP assurance process.";
- sendmail("support@cacert.org", "[CAcert.org] "._("TTP request."), $body, "support@cacert.org", "", "", "CAcert Website");
-
- //This mail needs to be translated
- L10n::set_translation($my_translation);
-
- $body =_("You are receiving this email because you asked for TTP assurance.")."\n\n";
- if ($_POST['ttptopup']=='1') {
- $body .=_("You are requesting the TTP TOPUP.")."\n\n";
- }else{
- $body .=_("You are NOT requesting the TTP TOPUP.")."\n\n";
- }
- $body .= _("Best regards")."\n";
- $body .= _("CAcert Support Team");
+ if ($_POST['ttp']!='') {
+ //This mail does not need to be translated
+ $body = "Hi TTP adminstrators,\n\n";
+ $body .= "User ".$_SESSION['profile']['fname']." ".
+ $_SESSION['profile']['lname']." with email address '".
+ $_SESSION['profile']['email']."' is requesting a TTP assurances for ".
+ mysql_escape_string(stripslashes($_POST['country'])).".\n\n";
+ if ($_POST['ttptopup']=='1') {
+ $body .= "The user is also requesting TTP TOPUP.\n\n";
+ }else{
+ $body .= "The user is NOT requesting TTP TOPUP.\n\n";
+ }
+ $body .= "The user received ".intval($_SESSION['profile']['points'])." assurance points up to today.\n\n";
+ $body .= "Please start the TTP assurance process.";
+ sendmail("support@cacert.org", "[CAcert.org] TTP request.", $body, "support@cacert.org", "", "", "CAcert Website");
+
+ //This mail needs to be translated
+ $body =_("You are receiving this email because you asked for TTP assurance.")."\n\n";
+ if ($_POST['ttptopup']=='1') {
+ $body .=_("You are requesting TTP TOPUP.")."\n\n";
+ }else{
+ $body .=_("You are NOT requesting TTP TOPUP.")."\n\n";
+ }
+ $body .= _("Best regards")."\n";
+ $body .= _("CAcert Support Team");
- sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You requested TTP assurances"), $body, "support@cacert.org", "", "", "CAcert Support");
+ sendmail($_SESSION['profile']['email'], "[CAcert.org] "._("You requested TTP assurances"), $body, "support@cacert.org", "", "", "CAcert Support");
- }
+ }
}
@@ -372,12 +368,10 @@ $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";
}