summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-03-11 23:29:21 +0100
committerBenny Baumann <BenBE@geshi.org>2015-03-11 23:29:21 +0100
commitaaffd10f8439c32bfbb8bfca83c08f98f23fb2c9 (patch)
tree7ab88551fac426a01106c9319009995366a5be8b /www
parent864939478615916c3b5e129379f0b9f2d4613cf5 (diff)
parent0e14ede2f690be0df938ef2e98b974f60882612f (diff)
downloadcacert-devel-aaffd10f8439c32bfbb8bfca83c08f98f23fb2c9.tar.gz
cacert-devel-aaffd10f8439c32bfbb8bfca83c08f98f23fb2c9.tar.xz
cacert-devel-aaffd10f8439c32bfbb8bfca83c08f98f23fb2c9.zip
Merge branch 'bug-1341' into testserver-stable
Diffstat (limited to 'www')
-rw-r--r--www/index.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/www/index.php b/www/index.php
index 6baf48b..e7229c5 100644
--- a/www/index.php
+++ b/www/index.php
@@ -248,10 +248,8 @@ require_once('../includes/notary.inc.php');
$query = "select * from `users` where `email`='$email' and (`password`=old_password('$pword') or `password`=sha1('$pword') or
`password`=password('$pword')) and `verified`=0 and `deleted`=0";
$res = mysql_query($query);
- if(!$rateLimit) {
- $_SESSION['_config']['errmsg'] = _("You hit the login rate limit of 1 login per 5 seconds.");
- } else if(mysql_num_rows($res) <= 0) {
- $_SESSION['_config']['errmsg'] = _("Incorrect email address and/or Pass Phrase.");
+ if(!$rateLimit || mysql_num_rows($res) <= 0) {
+ $_SESSION['_config']['errmsg'] = _("Login failed due to incorrect email address, wrong passphrase or because the rate limit of one login per 5 seconds was hit.");
} else {
$_SESSION['_config']['errmsg'] = _("Your account has not been verified yet, please check your email account for the signup messages.");
}