aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2006-05-19 22:50:25 +0000
committerDavid M <davidmj@users.sourceforge.net>2006-05-19 22:50:25 +0000
commit917eeebc1a3fb19bdbeb479d4e7872c332a57277 (patch)
treeecc5ac8e3bf10b9d80f84b5cefdbc77cdf57a34f /phpBB/includes/auth
parent8e800e333ceae99945cb818709a4aba4de3362b0 (diff)
downloadforums-917eeebc1a3fb19bdbeb479d4e7872c332a57277.tar
forums-917eeebc1a3fb19bdbeb479d4e7872c332a57277.tar.gz
forums-917eeebc1a3fb19bdbeb479d4e7872c332a57277.tar.bz2
forums-917eeebc1a3fb19bdbeb479d4e7872c332a57277.tar.xz
forums-917eeebc1a3fb19bdbeb479d4e7872c332a57277.zip
a few changes ;-)
git-svn-id: file:///svn/phpbb/trunk@5934 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth')
-rw-r--r--phpBB/includes/auth/auth_db.php18
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index a4a6c8d268..071b61fdfe 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -71,15 +71,7 @@ function login_db(&$username, &$password)
if ($confirm_row)
{
- if (strcasecmp($confirm_row['code'], $confirm_code) == 0)
- {
- return array(
- 'status' => LOGIN_ERROR_ATTEMPTS,
- 'error_msg' => 'CONFIRM_CODE_WRONG',
- 'user_row' => $row,
- );
- }
- else
+ if (strcasecmp($confirm_row['code'], $confirm_code) === 0)
{
$sql = 'DELETE FROM ' . CONFIRM_TABLE . "
WHERE confirm_id = '" . $db->sql_escape($confirm_id) . "'
@@ -87,6 +79,14 @@ function login_db(&$username, &$password)
AND confirm_type = " . CONFIRM_LOGIN;
$db->sql_query($sql);
}
+ else
+ {
+ return array(
+ 'status' => LOGIN_ERROR_ATTEMPTS,
+ 'error_msg' => 'CONFIRM_CODE_WRONG',
+ 'user_row' => $row,
+ );
+ }
}
else
{