aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-07-26 12:14:41 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-07-26 12:14:41 +0000
commit58f3dea5cce26ebd66ba584e5a56ad799fb70caa (patch)
treeeb4337298882877994737ad9c8102aa177b9b64f /phpBB/includes
parent9b35e2b168d6416b0e77b3caa6a86ebd83f8afab (diff)
downloadforums-58f3dea5cce26ebd66ba584e5a56ad799fb70caa.tar
forums-58f3dea5cce26ebd66ba584e5a56ad799fb70caa.tar.gz
forums-58f3dea5cce26ebd66ba584e5a56ad799fb70caa.tar.bz2
forums-58f3dea5cce26ebd66ba584e5a56ad799fb70caa.tar.xz
forums-58f3dea5cce26ebd66ba584e5a56ad799fb70caa.zip
Timed ban check
git-svn-id: file:///svn/phpbb/trunk@2743 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/session.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index e8ac3b619f..9234afee73 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -193,7 +193,9 @@ class session {
$sql = "SELECT ban_ip, ban_userid, ban_email
FROM " . BANLIST_TABLE . "
- WHERE ban_ip IN (
+ WHERE ( ban_start + ban_length <= $current_time
+ OR ban_length = 0 )
+ AND ban_ip IN (
'" . $user_ip_parts[0] . ".',
'" . $user_ip_parts[0] . "." . $user_ip_parts[1] . ".',
'" . $user_ip_parts[0] . "." . $user_ip_parts[1] . "." . $user_ip_parts[2] . ".',