maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- replace placeholder with actual email address, fixes #566

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-01-27 12:35:27 +00:00
parent 2b699849ca
commit 903a91b9ea
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
index.php
View File

@@ -234,7 +234,8 @@ if($action == 'login')
$message = $lng['error']['login_blocked'];
break;
case 4:
$message = $lng['error']['errorsendingmail'];
$cmail = isset($_GET['customermail']) ? $_GET['customermail'] : 'unknown';
$message = str_replace('%s', $cmail, $lng['error']['errorsendingmail']);
break;
}
@@ -350,7 +351,7 @@ if($action == 'forgotpwd')
if ($_mailerror) {
$rstlog = FroxlorLogger::getInstanceOf(array('loginname' => 'password_reset'), $db, $settings);
$rstlog->logAction(ADM_ACTION, LOG_ERR, "Error sending mail: " . $mailerr_msg);
redirectTo('index.php', Array('showmessage' => '4'), true);
redirectTo('index.php', Array('showmessage' => '4', 'customermail' => $user['email']), true);
exit;
}