mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
Minor change to remove commented out ban check in _pagestart
git-svn-id: file:///svn/phpbb/trunk@413 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
02402ac147
commit
eb7f56a332
1 changed files with 2 additions and 24 deletions
|
@ -52,8 +52,8 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
|
||||||
//
|
//
|
||||||
$sql = "SELECT ban_ip, ban_userid
|
$sql = "SELECT ban_ip, ban_userid
|
||||||
FROM ".BANLIST_TABLE."
|
FROM ".BANLIST_TABLE."
|
||||||
WHERE (ban_ip = '$user_ip' OR ban_userid = $user_id)
|
WHERE ban_ip = '$user_ip'
|
||||||
AND (ban_start < $current_time AND ban_end > $current_time )";
|
OR ban_userid = $user_id";
|
||||||
$result = $db->sql_query($sql);
|
$result = $db->sql_query($sql);
|
||||||
if (!$result)
|
if (!$result)
|
||||||
{
|
{
|
||||||
|
@ -248,28 +248,6 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
|
||||||
if(isset($userdata['user_id']))
|
if(isset($userdata['user_id']))
|
||||||
{
|
{
|
||||||
|
|
||||||
//
|
|
||||||
// Initial ban check against IP and userid
|
|
||||||
// Is this really needed in this form?
|
|
||||||
// The new auth system will probably take care
|
|
||||||
// of all this on a fair 'fairier' level
|
|
||||||
//
|
|
||||||
/* $sql = "SELECT ban_ip, ban_userid
|
|
||||||
FROM ".BANLIST_TABLE."
|
|
||||||
WHERE (ban_ip = '$user_ip' OR ban_userid = '".$userdata['user_id']."')
|
|
||||||
AND (ban_start < $current_time AND ban_end > $current_time )";
|
|
||||||
$ban_result = $db->sql_query($sql);
|
|
||||||
if (!$ban_result)
|
|
||||||
{
|
|
||||||
error_die(SQL_QUERY, "Couldn't obtain ban information.", __LINE__, __FILE__);
|
|
||||||
}
|
|
||||||
$ban_info = $db->sql_fetchrow($ban_result);
|
|
||||||
|
|
||||||
if($ban_info['ban_ip'] || $ban_info['ban_userid'])
|
|
||||||
{
|
|
||||||
error_die(BANNED);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=".$sessiondata['sessionid'] : "";
|
$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=".$sessiondata['sessionid'] : "";
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
Loading…
Add table
Reference in a new issue