summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-05-12 22:50:38 +0200
committerBenny Baumann <BenBE@geshi.org>2015-05-12 22:50:38 +0200
commit8c8642a6de5533906270111d4592569b64cefc15 (patch)
treeb7e9c558ff41c1204a152115ebcbb7720a5e6eeb /www
parentdabfc656c18e1888481b52345660a238f158cae9 (diff)
parentcdf3dc9fb536596c55470a6541b6f393686a35fa (diff)
downloadcacert-devel-8c8642a6de5533906270111d4592569b64cefc15.tar.gz
cacert-devel-8c8642a6de5533906270111d4592569b64cefc15.tar.xz
cacert-devel-8c8642a6de5533906270111d4592569b64cefc15.zip
Merge branch 'bug-1042' into testserver-stable
Diffstat (limited to 'www')
-rw-r--r--www/wot.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/www/wot.php b/www/wot.php
index cde3870..3c29437 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -388,9 +388,10 @@ function send_reminder()
$query .= ",\n`method`='TTP-TOPUP'";
}
mysql_query($query);
- fix_assurer_flag($_SESSION['_config']['notarise']['id']);
include_once("../includes/notary.inc.php");
+ recalculate_old_assurance_points($_SESSION['_config']['notarise']['id']);
+ fix_assurer_flag($_SESSION['_config']['notarise']['id']);
if($_SESSION['profile']['points'] < 150)
{
$addpoints = 0;
@@ -416,14 +417,14 @@ function send_reminder()
$body = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n";
- $body .= sprintf(_("You were issued %s assurance points and you now have %s assurance points in total."), $awarded, ($awarded + $drow_total))."\n\n";
+ $body .= sprintf(_("You were issued %s assurance points and you now have %s assurance points in total."), $awarded, ($awarded + $drow_points))."\n\n";
- if(($drow_total + $awarded) < 100 && ($drow_total + $awarded) >= 50)
+ if(($drow_points + $awarded) < 100 && ($drow_points + $awarded) >= 50)
{
$body .= _("You now have over 50 points, and can now have your name added to client certificates, and issue server certificates for up to 2 years.")."\n\n";
}
- if(($drow_total + $awarded) >= 100 && $drow_total < 0 && !is_assurer(intval($_SESSION['_config']['notarise']['id'])) )
+ if(($drow_points + $awarded) >= 100 && $drow_points < 0 && !is_assurer(intval($_SESSION['_config']['notarise']['id'])) )
{
$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";
@@ -440,7 +441,7 @@ function send_reminder()
L10n::set_translation($my_translation);
$body = sprintf(_("You are receiving this email because you have assured %s %s (%s)."), $_SESSION['_config']['notarise']['fname'], $_SESSION['_config']['notarise']['lname'], $_SESSION['_config']['notarise']['email'])."\n\n";
- $body .= sprintf(_("You issued %s assurance points and they now have %s assurance points in total."), $awarded, ($awarded + $drow['total']))."\n\n";
+ $body .= sprintf(_("You issued %s assurance points."), $awarded)."\n\n";
$body .= _("Best regards")."\n";
$body .= _("CAcert Support Team");