mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Enable exclusion from bans for users, IP's or email addresses

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3267 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-01-07 18:39:24 +00:00
parent 493a689b1e
commit 82b23fdf67
3 changed files with 78 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/includes/session.php
View File

@@ -171,7 +171,10 @@ class session
$this->data['user_id'] = $user_id = ANONYMOUS;
}
$sql = "SELECT ban_ip, ban_userid, ban_email
// Is user banned? Are they excempt?
$banned = false;
$sql = "SELECT ban_ip, ban_userid, ban_email, ban_exclude
FROM " . BANLIST_TABLE . "
WHERE ban_end >= $current_time
OR ban_end = 0";
@@ -179,16 +182,30 @@ class session
while ($row = $db->sql_fetchrow($result))
{
if (( $row['user_id'] == $this->data['user_id'] ||
if ((
($row['user_id'] == $this->data['user_id']) ||
($row['ban_ip'] && preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $this->ip)) ||
($row['ban_email'] && preg_match('#^' . str_replace('*', '.*?', $row['ban_email']) . '$#i', $this->data['user_email'])))
&& !$this->data['user_founder'])
{
trigger_error('You_been_banned');
if (!empty($row['ban_exclude']))
{
$banned = false;
break;
}
else
{
$banned = true;
}
}
}
$db->sql_freeresult($result);
if ($banned)
{
trigger_error('You_been_banned');
}
// Is there an existing session? If so, grab last visit time from that
$this->data['session_last_visit'] = ($this->data['session_time']) ? $this->data['session_time'] : (($this->data['user_lastvisit']) ? $this->data['user_lastvisit'] : time());