mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-09 17:16:20 +02:00
Code Issues Releases Wiki Activity

check ban issue fix

Browse Source
This commit is contained in:
secretr
2011-09-15 13:03:25 +00:00
parent d5dda7fd50
commit c3e47ec137
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_handlers/e107_class.php
View File

@ -2522,16 +2522,19 @@ class e107
//$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Retrigger Ban",$row['banlist_ip'],FALSE,LOG_TO_ROLLING); //$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Retrigger Ban",$row['banlist_ip'],FALSE,LOG_TO_ROLLING);
} }
//$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Active Ban",$query,FALSE,LOG_TO_ROLLING); //$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","Active Ban",$query,FALSE,LOG_TO_ROLLING);
$admin_log->e_log_event(4, __FILE__."|".__FUNCTION__."@".__LINE__, 'BAN_03', 'LAN_AUDIT_LOG_003', $query, FALSE, LOG_TO_ROLLING);
if($show_error) if($show_error)
header("HTTP/1.1 403 Forbidden", true); header("HTTP/1.1 403 Forbidden", true);
if(isset($pref['ban_messages'])) if(isset($pref['ban_messages']))
{ // May want to display a message { // May want to display a message
// Ban still current here // Ban still current here
if($do_return)
return FALSE;
echo $tp->toHTML(varsettrue($pref['ban_messages'][$row['banlist_bantype']])); // Show message if one set echo $tp->toHTML(varsettrue($pref['ban_messages'][$row['banlist_bantype']])); // Show message if one set
} }
$admin_log->e_log_event(4, __FILE__."|".__FUNCTION__."@".__LINE__, 'BAN_03', 'LAN_AUDIT_LOG_003', $query, FALSE, LOG_TO_ROLLING); if($do_return)
return FALSE;
exit(); exit();
} }
//$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","No ban found",$query,FALSE,LOG_TO_ROLLING); //$admin_log->e_log_event(4,__FILE__."|".__FUNCTION__."@".__LINE__,"DBG","No ban found",$query,FALSE,LOG_TO_ROLLING);

4
e107_handlers/user_handler.php
View File

@ -606,13 +606,13 @@ Following fields auto-filled in code as required:
} }
elseif ($u_sql->db_Count('user', '(*)', "WHERE `user_email`='".$v."' AND `user_ban`=1 ")) elseif ($u_sql->db_Count('user', '(*)', "WHERE `user_email`='".$v."' AND `user_ban`=1 "))
{ {
$errMsg = ERR_BANNED_USER; $errMsg = ERR_BANNED_USER;
} }
else else
{ // See if email address banned { // See if email address banned
$wc = $this->make_email_query($v); // Generate the query for the ban list $wc = $this->make_email_query($v); // Generate the query for the ban list
if ($wc) { $wc = "`banlist_ip`='{$v}' OR ".$wc; } if ($wc) { $wc = "`banlist_ip`='{$v}' OR ".$wc; }
if (($wc === FALSE) || e107::getInstance()->check_ban($wc, FALSE, TRUE)) if (($wc === FALSE) || !e107::getInstance()->check_ban($wc, FALSE, TRUE))
{ {
// echo "Email banned<br />"; // echo "Email banned<br />";
$errMsg = ERR_BANNED_EMAIL; $errMsg = ERR_BANNED_EMAIL;