Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_disallow.php,1.7,1.8 admin_user_ban.php,1.18,1.19
|
From: Paul S. O. <ps...@us...> - 2002-03-20 00:21:30
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv21838/admin
Modified Files:
admin_disallow.php admin_user_ban.php
Log Message:
Add inclusion of validates functions + other minor updates
Index: admin_disallow.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_disallow.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** admin_disallow.php 18 Mar 2002 14:54:25 -0000 1.7
--- admin_disallow.php 20 Mar 2002 00:21:27 -0000 1.8
***************
*** 34,42 ****
// Include required files, get $phpEx and check permissions
//
! $phpbb_root_dir = "./../";
require('pagestart.inc');
if( isset($HTTP_POST_VARS['add_name']) )
{
$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
--- 34,44 ----
// Include required files, get $phpEx and check permissions
//
! $phpbb_root_dir = './../';
require('pagestart.inc');
if( isset($HTTP_POST_VARS['add_name']) )
{
+ include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
+
$disallowed_user = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );
Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** admin_user_ban.php 18 Mar 2002 19:42:05 -0000 1.18
--- admin_user_ban.php 20 Mar 2002 00:21:27 -0000 1.19
***************
*** 338,356 ****
else
{
-
$template->set_filenames(array(
! "body" => "admin/user_ban_body.tpl")
);
$template->assign_vars(array(
! "L_BAN_TITLE" => $lang['Ban_control'],
! "L_BAN_EXPLAIN" => $lang['Ban_explain'],
! "L_BAN_EXPLAIN_WARN" => $lang['Ban_explain_warn'],
! "L_IP_OR_HOSTNAME" => $lang['IP_hostname'],
! "L_EMAIL_ADDRESS" => $lang['Email_address'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
! "S_BANLIST_ACTION" => append_sid("admin_user_ban.$phpEx"))
);
--- 338,355 ----
else
{
$template->set_filenames(array(
! 'body' => 'admin/user_ban_body.tpl')
);
$template->assign_vars(array(
! 'L_BAN_TITLE' => $lang['Ban_control'],
! 'L_BAN_EXPLAIN' => $lang['Ban_explain'],
! 'L_BAN_EXPLAIN_WARN' => $lang['Ban_explain_warn'],
! 'L_IP_OR_HOSTNAME' => $lang['IP_hostname'],
! 'L_EMAIL_ADDRESS' => $lang['Email_address'],
! 'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
! 'S_BANLIST_ACTION' => append_sid("admin_user_ban.$phpEx"))
);
***************
*** 361,384 ****
WHERE user_id <> " . ANONYMOUS . "
ORDER BY username ASC";
! $u_result = $db->sql_query($sql);
! $user_list = $db->sql_fetchrowset($u_result);
! $select_userlist = "";
for($i = 0; $i < count($user_list); $i++)
{
! $select_userlist .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
$userban_count++;
}
! $select_userlist = "<select name=\"ban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist . "</select>";
$template->assign_vars(array(
! "L_BAN_USER" => $lang['Ban_username'],
! "L_BAN_USER_EXPLAIN" => $lang['Ban_username_explain'],
! "L_BAN_IP" => $lang['Ban_IP'],
! "L_BAN_IP_EXPLAIN" => $lang['Ban_IP_explain'],
! "L_BAN_EMAIL" => $lang['Ban_email'],
! "L_BAN_EMAIL_EXPLAIN" => $lang['Ban_email_explain'],
! "S_BAN_USERLIST_SELECT" => $select_userlist)
);
--- 360,388 ----
WHERE user_id <> " . ANONYMOUS . "
ORDER BY username ASC";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
! }
! $user_list = $db->sql_fetchrowset($result);
! $db->sql_freeresult($result);
!
! $select_userlist = '';
for($i = 0; $i < count($user_list); $i++)
{
! $select_userlist .= '<option value="' . $user_list[$i]['user_id'] . '">' . $user_list[$i]['username'] . '</option>';
$userban_count++;
}
! $select_userlist = '<select name="ban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
$template->assign_vars(array(
! 'L_BAN_USER' => $lang['Ban_username'],
! 'L_BAN_USER_EXPLAIN' => $lang['Ban_username_explain'],
! 'L_BAN_IP' => $lang['Ban_IP'],
! 'L_BAN_IP_EXPLAIN' => $lang['Ban_IP_explain'],
! 'L_BAN_EMAIL' => $lang['Ban_email'],
! 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'],
! 'S_BAN_USERLIST_SELECT' => $select_userlist)
);
***************
*** 393,471 ****
AND u.user_id <> " . ANONYMOUS . "
ORDER BY u.user_id ASC";
! $u_result = $db->sql_query($sql);
! $user_list = $db->sql_fetchrowset($u_result);
! $select_userlist = "";
for($i = 0; $i < count($user_list); $i++)
{
! $select_userlist .= "<option value=\"" . $user_list[$i]['ban_id'] . "\">" . $user_list[$i]['username'] . "</option>";
$userban_count++;
}
! if( $select_userlist == "" )
{
! $select_userlist = "<option value=\"-1\">" . $lang['No_banned_users'] . "</option>";
}
! $select_userlist = "<select name=\"unban_user[]\" multiple=\"multiple\" size=\"5\">" . $select_userlist;
! $select_userlist .= "</select>";
$sql = "SELECT ban_id, ban_ip, ban_email
FROM " . BANLIST_TABLE;
! $b_result = $db->sql_query($sql);
! $banlist = $db->sql_fetchrowset($b_result);
! $select_iplist = "";
! $select_emaillist = "";
! for($i = 0; $i < $db->sql_numrows($b_result); $i++)
{
$ban_id = $banlist[$i]['ban_id'];
! 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++;
}
! else if( !empty($banlist[$i]['ban_email']) )
{
$ban_email = $banlist[$i]['ban_email'];
! $select_emaillist .= "<option value=\"$ban_id\">$ban_email</option>";
$emailban_count++;
}
}
! if($select_iplist == "")
{
! $select_iplist = "<option value=\"-1\">" . $lang['No_banned_ip'] . "</option>";
}
! if( $select_emaillist == "")
{
! $select_emaillist = "<option value=\"-1\">" . $lang['No_banned_email'] . "</option>";
}
! $select_iplist = "<select name=\"unban_ip[]\" multiple=\"multiple\" size=\"5\">" . $select_iplist . "</select>";
! $select_emaillist = "<select name=\"unban_email[]\" multiple=\"multiple\" size=\"5\">" . $select_emaillist . "</select>";
$template->assign_vars(array(
! "L_UNBAN_USER" => $lang['Unban_username'],
! "L_UNBAN_USER_EXPLAIN" => $lang['Unban_username_explain'],
! "L_UNBAN_IP" => $lang['Unban_IP'],
! "L_UNBAN_IP_EXPLAIN" => $lang['Unban_IP_explain'],
! "L_UNBAN_EMAIL" => $lang['Unban_email'],
! "L_UNBAN_EMAIL_EXPLAIN" => $lang['Unban_email_explain'],
!
! "S_UNBAN_USERLIST_SELECT" => $select_userlist,
! "S_UNBAN_IPLIST_SELECT" => $select_iplist,
! "S_UNBAN_EMAILLIST_SELECT" => $select_emaillist,
! "S_BAN_ACTION" => append_sid("admin_user_ban.$phpEx"))
);
}
! $template->pparse("body");
include('page_footer_admin.'.$phpEx);
! ?>
--- 397,484 ----
AND u.user_id <> " . ANONYMOUS . "
ORDER BY u.user_id ASC";
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not select current user_id ban list', '', __LINE__, __FILE__, $sql);
! }
!
! $user_list = $db->sql_fetchrowset($result);
! $db->sql_freeresult($result);
! $select_userlist = '';
for($i = 0; $i < count($user_list); $i++)
{
! $select_userlist .= '<option value="' . $user_list[$i]['ban_id'] . '">' . $user_list[$i]['username'] . '</option>';
$userban_count++;
}
! if( $select_userlist == '' )
{
! $select_userlist = '<option value="-1">' . $lang['No_banned_users'] . '</option>';
}
! $select_userlist = '<select name="unban_user[]" multiple="multiple" size="5">' . $select_userlist . '</select>';
$sql = "SELECT ban_id, ban_ip, ban_email
FROM " . BANLIST_TABLE;
! if ( !($result = $db->sql_query($sql)) )
! {
! message_die(GENERAL_ERROR, 'Could not select current ip ban list', '', __LINE__, __FILE__, $sql);
! }
!
! $banlist = $db->sql_fetchrowset($result);
! $db->sql_freeresult($result);
! $select_iplist = '';
! $select_emaillist = '';
! for($i = 0; $i < count($banlist); $i++)
{
$ban_id = $banlist[$i]['ban_id'];
! 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++;
}
! else if ( !empty($banlist[$i]['ban_email']) )
{
$ban_email = $banlist[$i]['ban_email'];
! $select_emaillist .= '<option value="' . $ban_id . '">' . $ban_email . '</option>';
$emailban_count++;
}
}
! if ( $select_iplist == '' )
{
! $select_iplist = '<option value="-1">' . $lang['No_banned_ip'] . '</option>';
}
! if ( $select_emaillist == '' )
{
! $select_emaillist = '<option value="-1">' . $lang['No_banned_email'] . '</option>';
}
! $select_iplist = '<select name="unban_ip[]" multiple="multiple" size="5">' . $select_iplist . '</select>';
! $select_emaillist = '<select name="unban_email[]" multiple="multiple" size="5">' . $select_emaillist . '</select>';
$template->assign_vars(array(
! 'L_UNBAN_USER' => $lang['Unban_username'],
! 'L_UNBAN_USER_EXPLAIN' => $lang['Unban_username_explain'],
! 'L_UNBAN_IP' => $lang['Unban_IP'],
! 'L_UNBAN_IP_EXPLAIN' => $lang['Unban_IP_explain'],
! 'L_UNBAN_EMAIL' => $lang['Unban_email'],
! 'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'],
!
! 'S_UNBAN_USERLIST_SELECT' => $select_userlist,
! 'S_UNBAN_IPLIST_SELECT' => $select_iplist,
! 'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist,
! 'S_BAN_ACTION' => append_sid("admin_user_ban.$phpEx"))
);
}
! $template->pparse('body");
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
|
