makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

make the ban check perform a bit better :/

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8202 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-10-18 17:44:02 +00:00
parent 7b1a8511ce
commit 6e530cb851
2 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions_user.php
View file

@ -659,7 +659,7 @@ function user_active_flip($mode, $user_id_ary, $reason = INACTIVE_MANUAL)
*/ */
function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason = '') function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason = '')
{ {
global $db, $user, $auth; global $db, $user, $auth, $cache;
// Delete stale bans // Delete stale bans
$sql = 'DELETE FROM ' . BANLIST_TABLE . ' $sql = 'DELETE FROM ' . BANLIST_TABLE . '
@ -1043,10 +1043,14 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
add_log('mod', 0, 0, $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); add_log('mod', 0, 0, $log_entry . strtoupper($mode), $ban_reason, $ban_list_log);
$cache->destroy('sql', BANLIST_TABLE);
return true; return true;
} }
// There was nothing to ban/exclude // There was nothing to ban/exclude. But destroying the cache because of the removal of stale bans.
$cache->destroy('sql', BANLIST_TABLE);
return false; return false;
} }
@ -1055,7 +1059,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
*/ */
function user_unban($mode, $ban) function user_unban($mode, $ban)
{ {
global $db, $user, $auth; global $db, $user, $auth, $cache;
// Delete stale bans // Delete stale bans
$sql = 'DELETE FROM ' . BANLIST_TABLE . ' $sql = 'DELETE FROM ' . BANLIST_TABLE . '
@ -1112,6 +1116,8 @@ function user_unban($mode, $ban)
add_log('mod', 0, 0, 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list); add_log('mod', 0, 0, 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list);
} }
$cache->destroy('sql', BANLIST_TABLE);
return false; return false;
} }

29
phpBB/includes/session.php
View file

@ -905,48 +905,59 @@ class session
} }
$banned = false; $banned = false;
$cache_ttl = 3600;
$where_sql = array();
$sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end $sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end
FROM ' . BANLIST_TABLE . ' FROM ' . BANLIST_TABLE . '
WHERE (ban_end >= ' . time() . ' OR ban_end = 0)'; WHERE ';
// Determine which entries to check, only return those // Determine which entries to check, only return those
if ($user_email === false) if ($user_email === false)
{ {
$sql .= " AND ban_email = ''"; $where_sql[] = "ban_email = ''";
} }
if ($user_ips === false) if ($user_ips === false)
{ {
$sql .= " AND (ban_ip = '' OR ban_exclude = 1)"; $where_sql[] = "(ban_ip = '' OR ban_exclude = 1)";
} }
if ($user_id === false) if ($user_id === false)
{ {
$sql .= ' AND (ban_userid = 0 OR ban_exclude = 1)'; $where_sql[] = '(ban_userid = 0 OR ban_exclude = 1)';
} }
else else
{ {
$sql .= ' AND (ban_userid = ' . $user_id; $cache_ttl = ($user_id == ANONYMOUS) ? 3600 : 0;
$_sql = '(ban_userid = ' . $user_id;
if ($user_email !== false) if ($user_email !== false)
{ {
$sql .= " OR ban_email <> ''"; $_sql .= " OR ban_email <> ''";
} }
if ($user_ips !== false) if ($user_ips !== false)
{ {
$sql .= " OR ban_ip <> ''"; $_sql .= " OR ban_ip <> ''";
} }
$sql .= ')'; $_sql .= ')';
$where_sql[] = $_sql;
} }
$result = $db->sql_query($sql); $sql .= (sizeof($where_sql)) ? implode(' AND ', $where_sql) : '';
$result = $db->sql_query($sql, $cache_ttl);
$ban_triggered_by = 'user'; $ban_triggered_by = 'user';
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
if ($row['ban_end'] && $row['ban_end'] < time())
{
continue;
}
$ip_banned = false; $ip_banned = false;
if (!empty($row['ban_ip'])) if (!empty($row['ban_ip']))
{ {