diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-11 19:42:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-11 19:42:04 +0200 |
| commit | fe5d616349df911d7053c4862cc734a8de21b4fb (patch) | |
| tree | f367d086f63d6077c72a51b69f9070784da21aa2 /phpBB/includes/session.php | |
| parent | 0cad4ed49f6272f029afad0fb613a8855f0a5b43 (diff) | |
| parent | bf2125f0f7c2b3d2f270ae4f3117941dd108f35a (diff) | |
| download | forums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar forums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar.gz forums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar.bz2 forums-fe5d616349df911d7053c4862cc734a8de21b4fb.tar.xz forums-fe5d616349df911d7053c4862cc734a8de21b4fb.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 98d5eaf32b..9e1aefa309 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1019,6 +1019,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; |