summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-01-20 23:54:43 +0100
committerBenny Baumann <BenBE@geshi.org>2015-01-20 23:54:43 +0100
commit6d8b65354e3caa6569b358173a7eb950dd716a4f (patch)
treed76f4f1eb557ab4c26b95f3dd16c3d0c4755c96b
parentad332491fda539e923d49e617f5be99efabdfc3b (diff)
parentf4640b86d408433a0aea7ff9665e12f6f204c38d (diff)
downloadcacert-devel-6d8b65354e3caa6569b358173a7eb950dd716a4f.tar.gz
cacert-devel-6d8b65354e3caa6569b358173a7eb950dd716a4f.tar.xz
cacert-devel-6d8b65354e3caa6569b358173a7eb950dd716a4f.zip
Merge branch 'bug-1129' into testserver-stable
-rw-r--r--pages/account/43.php11
1 files changed, 3 insertions, 8 deletions
diff --git a/pages/account/43.php b/pages/account/43.php
index 6e4ebf1..dfae9af 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -321,14 +321,10 @@ if(intval($_REQUEST['userid']) > 0) {
<?
} else {
$body = sprintf(_("Hi %s,"),$row['fname'])."\n\n";
- $ip = anonymizeIp($_SERVER['REMOTE_ADDR']);
- if($ip === false) {
- $ip = _("Error");
- }
- $body .= sprintf(_("You receive this automatic mail since you yourself or someone ".
- "else looked up your secret questions and answers for a forgotten ".
+ $body .= sprintf(_("You receive this automatic mail since a supporter ".
+ "looked up your secret questions and answers for a forgotten ".
"password.\n\n".
- "Network: %s\nTime: %s\n\n".
+ "Time: %s\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".
@@ -336,7 +332,6 @@ if(intval($_REQUEST['userid']) > 0) {
"there is a danger that an unauthorised person accessed your ".
"account, and you should promptly change your password and your ".
"secret questions and answers."),
- $ip,
date("Y-m-d H:i:s T"))."\n\n";
$body .= _("Best regards")."\n"._("CAcert Support");