Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_mass_email.php,1.16,1.17 admin_user_ban.php,1.21,1.22 index.php,1.40,1.41
|
From: Paul S. O. <ps...@us...> - 2002-05-09 14:30:34
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv26634/admin
Modified Files:
admin_mass_email.php admin_user_ban.php index.php
Log Message:
IP related updates
Index: admin_mass_email.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_mass_email.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** admin_mass_email.php 20 Apr 2002 00:22:27 -0000 1.16
--- admin_mass_email.php 9 May 2002 14:07:41 -0000 1.17
***************
*** 128,132 ****
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
$emailer->use_template('admin_send_email');
--- 128,132 ----
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
! $email_headers .= 'X-AntiAbuse: User IP - ' . $user_ip . "\r\n";
$emailer->use_template('admin_send_email');
Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** admin_user_ban.php 22 Mar 2002 17:00:32 -0000 1.21
--- admin_user_ban.php 9 May 2002 14:07:41 -0000 1.22
***************
*** 34,38 ****
// Load default header
//
! $phpbb_root_path = "../";
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
--- 34,38 ----
// Load default header
//
! $phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
***************
*** 43,49 ****
if( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = "";
! $email_bansql = "";
! $ip_bansql = "";
$user_list = array();
--- 43,49 ----
if( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = '';
! $email_bansql = '';
! $ip_bansql = '';
$user_list = array();
***************
*** 61,69 ****
if( isset($HTTP_POST_VARS['ban_ip']) )
{
! $ip_list_temp = explode(",", $HTTP_POST_VARS['ban_ip']);
for($i = 0; $i < count($ip_list_temp); $i++)
{
! if( preg_match("/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/", trim($ip_list_temp[$i]), $ip_range_explode) )
{
//
--- 61,69 ----
if( isset($HTTP_POST_VARS['ban_ip']) )
{
! $ip_list_temp = explode(',', $HTTP_POST_VARS['ban_ip']);
for($i = 0; $i < count($ip_list_temp); $i++)
{
! if( preg_match('/^([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})[ ]*\-[ ]*([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})$/', trim($ip_list_temp[$i]), $ip_range_explode) )
{
//
***************
*** 80,87 ****
if($ip_2_counter == 0 && $ip_2_end == 254)
{
! $ip_2_counter = 255;
! $ip_2_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.255.255.255");
}
--- 80,87 ----
if($ip_2_counter == 0 && $ip_2_end == 254)
{
! $ip_2_counter = 256;
! $ip_2_fragment = 256;
! $ip_list[] = "$ip_1_counter.256.256.256";
}
***************
*** 93,100 ****
if($ip_3_counter == 0 && $ip_3_end == 254 )
{
! $ip_3_counter = 255;
! $ip_3_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.255.255");
}
--- 93,100 ----
if($ip_3_counter == 0 && $ip_3_end == 254 )
{
! $ip_3_counter = 256;
! $ip_3_fragment = 256;
! $ip_list[] = "$ip_1_counter.$ip_2_counter.256.256";
}
***************
*** 106,118 ****
if($ip_4_counter == 0 && $ip_4_end == 254)
{
! $ip_4_counter = 255;
! $ip_4_fragment = 255;
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.255");
}
while($ip_4_counter <= $ip_4_end)
{
! $ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
$ip_4_counter++;
}
--- 106,118 ----
if($ip_4_counter == 0 && $ip_4_end == 254)
{
! $ip_4_counter = 256;
! $ip_4_fragment = 256;
! $ip_list[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.256";
}
while($ip_4_counter <= $ip_4_end)
{
! $ip_list[] = "$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter";
$ip_4_counter++;
}
***************
*** 124,128 ****
}
}
! else if( preg_match("/^([\w\-_]\.?){2,}$/is", trim($ip_list_temp[$i])) )
{
$ip = gethostbynamel(trim($ip_list_temp[$i]));
--- 124,128 ----
}
}
! else if( preg_match('/^([\w\-_]\.?){2,}$/is', trim($ip_list_temp[$i])) )
{
$ip = gethostbynamel(trim($ip_list_temp[$i]));
***************
*** 132,142 ****
if( !empty($ip[$j]) )
{
! $ip_list[] = encode_ip($ip[$j]);
}
}
}
! else if( preg_match("/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/", trim($ip_list_temp[$i])) )
{
! $ip_list[] = encode_ip(str_replace("*", "255", trim($ip_list_temp[$i])));
}
}
--- 132,142 ----
if( !empty($ip[$j]) )
{
! $ip_list[] = $ip[$j];
}
}
}
! else if( preg_match('/^([0-9]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})\.([0-9\*]{1,3})$/', trim($ip_list_temp[$i])) )
{
! $ip_list[] = str_replace('*', '256', trim($ip_list_temp[$i]));
}
}
***************
*** 146,150 ****
if(isset($HTTP_POST_VARS['ban_email']))
{
! $email_list_temp = explode(",", $HTTP_POST_VARS['ban_email']);
for($i = 0; $i < count($email_list_temp); $i++)
--- 146,150 ----
if(isset($HTTP_POST_VARS['ban_email']))
{
! $email_list_temp = explode(',', $HTTP_POST_VARS['ban_email']);
for($i = 0; $i < count($email_list_temp); $i++)
***************
*** 155,159 ****
// section)
//
! if( eregi("^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$", trim($email_list_temp[$i])) )
{
$email_list[] = trim($email_list_temp[$i]);
--- 155,159 ----
// section)
//
! if( eregi('^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$', trim($email_list_temp[$i])) )
{
$email_list[] = trim($email_list_temp[$i]);
***************
*** 171,175 ****
$current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = "";
for($i = 0; $i < count($user_list); $i++)
{
--- 171,175 ----
$current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = '';
for($i = 0; $i < count($user_list); $i++)
{
***************
*** 185,189 ****
if(!$in_banlist)
{
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
--- 185,189 ----
if(!$in_banlist)
{
! $kill_session_sql .= ( ($kill_session_sql != '') ? ' OR ' : '' ) . "session_user_id = " . $user_list[$i];
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
***************
*** 207,222 ****
}
! if(!$in_banlist)
{
! if( preg_match("/(ff\.)|(\.ff)/is", chunk_split($ip_list[$i], 2, ".")) )
! {
! $kill_ip_sql = "session_ip LIKE '" . str_replace(".", "", preg_replace("/(ff\.)|(\.ff)/is", "%", chunk_split($ip_list[$i], 2, "."))) . "'";
! }
! else
! {
! $kill_ip_sql = "session_ip = '" . $ip_list[$i] . "'";
! }
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
--- 207,215 ----
}
! if ( !$in_banlist )
{
! $kill_ip_sql = ( preg_match('/256/s') ) ? "session_ip LIKE '" . preg_replace('/(256)/s', '%', $ip_list[$i]) . "'" : "session_ip = '" . $ip_list[$i] . "'";
! $kill_session_sql .= ( ($kill_session_sql != '') ? ' OR ' : '' ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
***************
*** 439,443 ****
if ( !empty($banlist[$i]['ban_ip']) )
{
! $ban_ip = str_replace('255', '*', decode_ip($banlist[$i]['ban_ip']));
$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
$ipban_count++;
--- 432,436 ----
if ( !empty($banlist[$i]['ban_ip']) )
{
! $ban_ip = str_replace('256', '*', $banlist[$i]['ban_ip']);
$select_iplist .= '<option value="' . $ban_id . '">' . $ban_ip . '</option>';
$ipban_count++;
Index: index.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/index.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** index.php 25 Mar 2002 20:37:14 -0000 1.40
--- index.php 9 May 2002 14:07:41 -0000 1.41
***************
*** 444,448 ****
$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $reg_ip = decode_ip($onlinerow_reg[$i]['session_ip']);
$template->assign_block_vars("reg_user_row", array(
--- 444,448 ----
$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $reg_ip = $onlinerow_reg[$i]['session_ip'];
$template->assign_block_vars("reg_user_row", array(
***************
*** 536,540 ****
$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $guest_ip = decode_ip($onlinerow_guest[$i]['session_ip']);
$template->assign_block_vars("guest_user_row", array(
--- 536,540 ----
$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
! $guest_ip = $onlinerow_guest[$i]['session_ip'];
$template->assign_block_vars("guest_user_row", array(
|
