aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-06-11 19:40:03 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-06-11 19:40:03 +0200
commitbf2125f0f7c2b3d2f270ae4f3117941dd108f35a (patch)
treeb5a3fa0b2da88804d649b6492be86587d510e93f /phpBB/includes/session.php
parent76167c6b912fcb577d31b6b27090262512862c1b (diff)
parentf1998ddbc712015562b8e16fdc0f42a4c85ae82e (diff)
downloadforums-bf2125f0f7c2b3d2f270ae4f3117941dd108f35a.tar
forums-bf2125f0f7c2b3d2f270ae4f3117941dd108f35a.tar.gz
forums-bf2125f0f7c2b3d2f270ae4f3117941dd108f35a.tar.bz2
forums-bf2125f0f7c2b3d2f270ae4f3117941dd108f35a.tar.xz
forums-bf2125f0f7c2b3d2f270ae4f3117941dd108f35a.zip
Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympus
* naderman/ticket/9992: [ticket/9992] Clarify explanations of ip and account limits on login [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN [ticket/9992] Use sql_fetchfield for single row and single column result [ticket/9992] Adding a limit on login attempts per IP. [ticket/9992] Make sql_create_table and sql_table_exists available in updater
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 7db319493b..7ef6e02a8d 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -1006,6 +1006,10 @@ class session
include($phpbb_root_path . "includes/captcha/captcha_factory." . $phpEx);
}
phpbb_captcha_factory::garbage_collect($config['captcha_plugin']);
+
+ $sql = 'DELETE FROM ' . LOGIN_ATTEMPT_TABLE . '
+ WHERE attempt_time < ' . (time() - (int) $config['ip_login_limit_time']);
+ $db->sql_query($sql);
}
return;