Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_forum_prune.php,1.22.2.1,1.22.2.2 admin_forumauth.php,1.23.2.1,1.23.2.2 admin_groups.php,1.25.2.1,1.25.2.2 admin_ranks.php,1.13.2.1,1.13.2.2 admin_smilies.php,1.22.2.1,1.22.2.2 admin_ug_auth.php,1.13.2.1,1.13.2.2 admin_user_ban.php,1.21.2.1,1.21.2.2 admin_users.php,1.57.2.1,1.57.2.2 admin_words.php,1.10.2.1,1.10.2.2 page_footer_admin.php,1.9.2.1,1.9.2.2 page_header_admin.php,1.12.2.1,1.12.2.2
|
From: Paul S. O. <ps...@us...> - 2002-05-12 15:58:18
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv9802/admin
Modified Files:
Tag: phpBB-2_0_0
admin_forum_prune.php admin_forumauth.php admin_groups.php
admin_ranks.php admin_smilies.php admin_ug_auth.php
admin_user_ban.php admin_users.php admin_words.php
page_footer_admin.php page_header_admin.php
Log Message:
Yep, more updates and fixes
Index: admin_forum_prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forum_prune.php,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** admin_forum_prune.php 12 May 2002 00:47:40 -0000 1.22.2.1
--- admin_forum_prune.php 12 May 2002 15:57:44 -0000 1.22.2.2
***************
*** 179,182 ****
--- 179,183 ----
'FORUM_NAME' => $forum_name,
+ 'L_FORUM' => $lang['Forum'],
'L_FORUM_PRUNE' => $lang['Forum_Prune'],
'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'],
Index: admin_forumauth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forumauth.php,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -r1.23.2.1 -r1.23.2.2
*** admin_forumauth.php 12 May 2002 00:47:40 -0000 1.23.2.1
--- admin_forumauth.php 12 May 2002 15:57:44 -0000 1.23.2.2
***************
*** 35,39 ****
//
$no_page_header = TRUE;
! $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
--- 35,39 ----
//
$no_page_header = TRUE;
! $phpbb_root_path = './../';
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
***************
*** 53,73 ****
);
! $simple_auth_types = array($lang['Public'], $lang['Registered'], $lang['Registered'] . " [" . $lang['Hidden'] . "]", $lang['Private'], $lang['Private'] . " [" . $lang['Hidden'] . "]", $lang['Moderators'], $lang['Moderators'] . " [" . $lang['Hidden'] . "]");
! $forum_auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_sticky", "auth_announce", "auth_vote", "auth_pollcreate");
$field_names = array(
! "auth_view" => $lang['View'],
! "auth_read" => $lang['Read'],
! "auth_post" => $lang['Post'],
! "auth_reply" => $lang['Reply'],
! "auth_edit" => $lang['Edit'],
! "auth_delete" => $lang['Delete'],
! "auth_sticky" => $lang['Sticky'],
! "auth_announce" => $lang['Announce'],
! "auth_vote" => $lang['Vote'],
! "auth_pollcreate" => $lang['Pollcreate']);
! $forum_auth_levels = array("ALL", "REG", "PRIVATE", "MOD", "ADMIN");
$forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN);
--- 53,73 ----
);
! $simple_auth_types = array($lang['Public'], $lang['Registered'], $lang['Registered'] . ' [' . $lang['Hidden'] . ']', $lang['Private'], $lang['Private'] . ' [' . $lang['Hidden'] . ']', $lang['Moderators'], $lang['Moderators'] . ' [' . $lang['Hidden'] . ']');
! $forum_auth_fields = array('auth_view', 'auth_read', 'auth_post', 'auth_reply', 'auth_edit', 'auth_delete', 'auth_sticky', 'auth_announce', 'auth_vote', 'auth_pollcreate');
$field_names = array(
! 'auth_view' => $lang['View'],
! 'auth_read' => $lang['Read'],
! 'auth_post' => $lang['Post'],
! 'auth_reply' => $lang['Reply'],
! 'auth_edit' => $lang['Edit'],
! 'auth_delete' => $lang['Delete'],
! 'auth_sticky' => $lang['Sticky'],
! 'auth_announce' => $lang['Announce'],
! 'auth_vote' => $lang['Vote'],
! 'auth_pollcreate' => $lang['Pollcreate']);
! $forum_auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN');
$forum_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN);
***************
*** 80,84 ****
{
unset($forum_id);
! $forum_sql = "";
}
--- 80,84 ----
{
unset($forum_id);
! $forum_sql = '';
}
***************
*** 97,101 ****
if( isset($HTTP_POST_VARS['submit']) )
{
! $sql = "";
if(!empty($forum_id))
--- 97,101 ----
if( isset($HTTP_POST_VARS['submit']) )
{
! $sql = '';
if(!empty($forum_id))
***************
*** 109,117 ****
for($i = 0; $i < count($simple_ary); $i++)
{
! $sql .= $forum_auth_fields[$i] . " = " . $simple_ary[$i];
! if($i < count($simple_ary) - 1)
! {
! $sql .= ", ";
! }
}
--- 109,113 ----
for($i = 0; $i < count($simple_ary); $i++)
{
! $sql .= ( ( $i < count($simple_ary) - 1 ) ? ', ' : '' ) . $forum_auth_fields[$i] . ' = ' . $simple_ary[$i];
}
***************
*** 124,130 ****
$value = $HTTP_POST_VARS[$forum_auth_fields[$i]];
! if($forum_auth_fields[$i] == 'auth_vote')
{
! if( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL )
{
$value = AUTH_REG;
--- 120,126 ----
$value = $HTTP_POST_VARS[$forum_auth_fields[$i]];
! if ( $forum_auth_fields[$i] == 'auth_vote' )
{
! if ( $HTTP_POST_VARS['auth_vote'] == AUTH_ALL )
{
$value = AUTH_REG;
***************
*** 132,140 ****
}
! $sql .= $forum_auth_fields[$i] . " = " . $value;
! if($i < count($forum_auth_fields) - 1)
! {
! $sql .= ", ";
! }
}
--- 128,132 ----
}
! $sql .= ( ( $i < count($forum_auth_fields) - 1 ) ? ', ' : '' ) .$forum_auth_fields[$i] . ' = ' . $value;
}
***************
*** 143,149 ****
}
! if($sql != "")
{
! if(!$db->sql_query($sql))
{
message_die(GENERAL_ERROR, "Couldn't update auth table!", "", __LINE__, __FILE__, $sql);
--- 135,141 ----
}
! if ( $sql != '' )
{
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't update auth table!", "", __LINE__, __FILE__, $sql);
***************
*** 156,160 ****
$template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
);
$message = $lang['Forum_auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_forumauth'], '<a href="' . append_sid("admin_forumauth.$phpEx") . '">', "</a>");
--- 148,152 ----
$template->assign_vars(array(
! 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=$forum_id") . '">')
);
$message = $lang['Forum_auth_updated'] . '<br /><br />' . sprintf($lang['Click_return_forumauth'], '<a href="' . append_sid("admin_forumauth.$phpEx") . '">', "</a>");
***************
*** 188,192 ****
//
$template->set_filenames(array(
! "body" => "admin/auth_select_body.tpl")
);
--- 180,184 ----
//
$template->set_filenames(array(
! 'body' => 'admin/auth_select_body.tpl')
);
***************
*** 199,209 ****
$template->assign_vars(array(
! "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
! "L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_AUTH_SELECT" => $lang['Select_a_Forum'],
! "L_LOOK_UP" => $lang['Look_up_Forum'],
! "S_AUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
! "S_AUTH_SELECT" => $select_list)
);
--- 191,201 ----
$template->assign_vars(array(
! 'L_AUTH_TITLE' => $lang['Auth_Control_Forum'],
! 'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'],
! 'L_AUTH_SELECT' => $lang['Select_a_Forum'],
! 'L_LOOK_UP' => $lang['Look_up_Forum'],
! 'S_AUTH_ACTION' => append_sid("admin_forumauth.$phpEx"),
! 'S_AUTH_SELECT' => $select_list)
);
***************
*** 216,220 ****
//
$template->set_filenames(array(
! "body" => "admin/auth_forum_body.tpl")
);
--- 208,212 ----
//
$template->set_filenames(array(
! 'body' => 'admin/auth_forum_body.tpl')
);
***************
*** 245,249 ****
// automatically switch into 'advanced' mode
//
! if(!isset($adv) && !$matched)
{
$adv = 1;
--- 237,241 ----
// automatically switch into 'advanced' mode
//
! if ( !isset($adv) && !$matched )
{
$adv = 1;
***************
*** 252,280 ****
$s_column_span == 0;
! if( empty($adv) )
{
! $simple_auth = "<select name=\"simpleauth\">";
for($j = 0; $j < count($simple_auth_types); $j++)
{
! if($matched_type == $j)
! {
! $simple_auth .= "<option value=\"$j\" selected>";
! $simple_auth .= $simple_auth_types[$j];
! $simple_auth .= "</option>";
! }
! else
! {
! $simple_auth .= "<option value=\"$j\">" . $simple_auth_types[$j] . "</option>";
! }
}
! $simple_auth .= "</select>";
! $template->assign_block_vars("forum_auth_titles", array(
! "CELL_TITLE" => $lang['Simple_mode'])
);
! $template->assign_block_vars("forum_auth_data", array(
! "S_AUTH_LEVELS_SELECT" => $simple_auth)
);
--- 244,264 ----
$s_column_span == 0;
! if ( empty($adv) )
{
! $simple_auth = '<select name="simpleauth">';
for($j = 0; $j < count($simple_auth_types); $j++)
{
! $selected = ( $matched_type == $j ) ? ' selected="selected"' : '';
! $simple_auth .= '<option value="' . $j . '"' . $selected . '>' . $simple_auth_types[$j] . '</option>';
}
! $simple_auth .= '</select>';
! $template->assign_block_vars('forum_auth_titles', array(
! 'CELL_TITLE' => $lang['Simple_mode'])
);
! $template->assign_block_vars('forum_auth_data', array(
! 'S_AUTH_LEVELS_SELECT' => $simple_auth)
);
***************
*** 289,316 ****
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $custom_auth[$j] = " <select name=\"" . $forum_auth_fields[$j] . "\">";
for($k = 0; $k < count($forum_auth_levels); $k++)
{
! if ( $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k] )
! {
! $custom_auth[$j] .= "<option value=\"" . $forum_auth_const[$k] . "\" selected>";
! $custom_auth[$j] .= $lang['Forum_' . $forum_auth_levels[$k]];
! $custom_auth[$j] .= "</option>";
! }
! else
! {
! $custom_auth[$j] .= "<option value=\"" . $forum_auth_const[$k] . "\">". $lang['Forum_' . $forum_auth_levels[$k]] . "</option>";
! }
}
! $custom_auth[$j] .= "</select> ";
$cell_title = $field_names[$forum_auth_fields[$j]];
! $template->assign_block_vars("forum_auth_titles", array(
! "CELL_TITLE" => $cell_title)
);
! $template->assign_block_vars("forum_auth_data", array(
! "S_AUTH_LEVELS_SELECT" => $custom_auth[$j])
);
--- 273,292 ----
for($j = 0; $j < count($forum_auth_fields); $j++)
{
! $custom_auth[$j] = ' <select name="' . $forum_auth_fields[$j] . '">';
for($k = 0; $k < count($forum_auth_levels); $k++)
{
! $selected = ( $forum_rows[0][$forum_auth_fields[$j]] == $forum_auth_const[$k] ) ? ' selected="selected"' : '';
! $custom_auth[$j] .= '<option value="' . $forum_auth_const[$k] . '"' . $selected . '>' . $lang['Forum_' . $forum_auth_levels[$k]] . '</option>';
}
! $custom_auth[$j] .= '</select> ';
$cell_title = $field_names[$forum_auth_fields[$j]];
! $template->assign_block_vars('forum_auth_titles', array(
! 'CELL_TITLE' => $cell_title)
);
! $template->assign_block_vars('forum_auth_data', array(
! 'S_AUTH_LEVELS_SELECT' => $custom_auth[$j])
);
***************
*** 319,323 ****
}
! $adv_mode = (empty($adv)) ? "1" : "0";
$switch_mode = append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=". $adv_mode);
$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
--- 295,299 ----
}
! $adv_mode = ( empty($adv) ) ? '1' : '0';
$switch_mode = append_sid("admin_forumauth.$phpEx?" . POST_FORUM_URL . "=" . $forum_id . "&adv=". $adv_mode);
$switch_mode_text = ( empty($adv) ) ? $lang['Advanced_mode'] : $lang['Simple_mode'];
***************
*** 327,342 ****
$template->assign_vars(array(
! "FORUM_NAME" => $forum_name,
! "L_AUTH_TITLE" => $lang['Auth_Control_Forum'],
! "L_AUTH_EXPLAIN" => $lang['Forum_auth_explain'],
! "L_SUBMIT" => $lang['Submit'],
! "L_RESET" => $lang['Reset'],
!
! "U_SWITCH_MODE" => $u_switch_mode,
!
! "S_FORUMAUTH_ACTION" => append_sid("admin_forumauth.$phpEx"),
! "S_COLUMN_SPAN" => $s_column_span,
! "S_HIDDEN_FIELDS" => $s_hidden_fields)
);
--- 303,319 ----
$template->assign_vars(array(
! 'FORUM_NAME' => $forum_name,
! 'L_FORUM' => $lang['Forum'],
! 'L_AUTH_TITLE' => $lang['Auth_Control_Forum'],
! 'L_AUTH_EXPLAIN' => $lang['Forum_auth_explain'],
! 'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
!
! 'U_SWITCH_MODE' => $u_switch_mode,
!
! 'S_FORUMAUTH_ACTION' => append_sid("admin_forumauth.$phpEx"),
! 'S_COLUMN_SPAN' => $s_column_span,
! 'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
***************
*** 345,349 ****
include('./page_header_admin.'.$phpEx);
! $template->pparse("body");
include('./page_footer_admin.'.$phpEx);
--- 322,326 ----
include('./page_header_admin.'.$phpEx);
! $template->pparse('body');
include('./page_footer_admin.'.$phpEx);
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -C2 -r1.25.2.1 -r1.25.2.2
*** admin_groups.php 12 May 2002 00:47:40 -0000 1.25.2.1
--- admin_groups.php 12 May 2002 15:57:44 -0000 1.25.2.2
***************
*** 309,313 ****
else
{
! message_die(GENERAL_MESSAGE, $lang['Group_mode_not_selected']);
}
}
--- 309,313 ----
else
{
! message_die(GENERAL_MESSAGE, $lang['No_group_action']);
}
}
Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** admin_ranks.php 12 May 2002 00:47:40 -0000 1.13.2.1
--- admin_ranks.php 12 May 2002 15:57:44 -0000 1.13.2.2
***************
*** 256,260 ****
"L_RANKS_TITLE" => $lang['Ranks_title'],
"L_RANKS_TEXT" => $lang['Ranks_explain'],
! "L_RANK" => $lang['Rank'],
"L_RANK_MINIMUM" => $lang['Rank_minimum'],
"L_SPECIAL_RANK" => $lang['Special_rank'],
--- 256,260 ----
"L_RANKS_TITLE" => $lang['Ranks_title'],
"L_RANKS_TEXT" => $lang['Ranks_explain'],
! "L_RANK" => $lang['Rank_title'],
"L_RANK_MINIMUM" => $lang['Rank_minimum'],
"L_SPECIAL_RANK" => $lang['Special_rank'],
Index: admin_smilies.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_smilies.php,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** admin_smilies.php 12 May 2002 00:47:40 -0000 1.22.2.1
--- admin_smilies.php 12 May 2002 15:57:44 -0000 1.22.2.2
***************
*** 287,291 ****
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smiley_instr'],
"L_SMILEY_CODE" => $lang['smiley_code'],
"L_SMILEY_URL" => $lang['smiley_url'],
--- 287,291 ----
"L_SMILEY_TITLE" => $lang['smiley_title'],
"L_SMILEY_CONFIG" => $lang['smiley_config'],
! "L_SMILEY_EXPLAIN" => $lang['smile_desc'],
"L_SMILEY_CODE" => $lang['smiley_code'],
"L_SMILEY_URL" => $lang['smiley_url'],
***************
*** 341,345 ****
if( !$result )
{
! message_die(GENERAL_ERROR, $lang['smile_edit_err'], "", __LINE__, __FILE__, $sql);
}
$smile_data = $db->sql_fetchrow($result);
--- 341,345 ----
if( !$result )
{
! message_die(GENERAL_ERROR, 'Could not obtain emoticon information', "", __LINE__, __FILE__, $sql);
}
$smile_data = $db->sql_fetchrow($result);
Index: admin_ug_auth.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ug_auth.php,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -C2 -r1.13.2.1 -r1.13.2.2
*** admin_ug_auth.php 12 May 2002 00:47:40 -0000 1.13.2.1
--- admin_ug_auth.php 12 May 2002 15:57:44 -0000 1.13.2.2
***************
*** 859,863 ****
$template->assign_vars(array(
'L_USER_OR_GROUPNAME' => ( $mode == 'user' ) ? $lang['Username'] : $lang['Group_name'],
- 'L_USER_OR_GROUP' => ( $mode == 'user' ) ? $lang['User'] : $lang['Group'],
'L_AUTH_TITLE' => ( $mode == 'user' ) ? $lang['Auth_Control_User'] : $lang['Auth_Control_Group'],
--- 859,862 ----
***************
*** 866,870 ****
'L_PERMISSIONS' => $lang['Permissions'],
'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
'U_USER_OR_GROUP' => append_sid("admin_ug_auth.$phpEx"),
--- 865,870 ----
'L_PERMISSIONS' => $lang['Permissions'],
'L_SUBMIT' => $lang['Submit'],
! 'L_RESET' => $lang['Reset'],
! 'L_FORUM' => $lang['Forum'],
'U_USER_OR_GROUP' => append_sid("admin_ug_auth.$phpEx"),
***************
*** 923,927 ****
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
! $l_type = ( $mode == 'user' ) ? "USER" : "AUTH";
$template->assign_vars(array(
--- 923,927 ----
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
! $l_type = ( $mode == 'user' ) ? 'USER' : 'AUTH';
$template->assign_vars(array(
Index: admin_user_ban.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_user_ban.php,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -C2 -r1.21.2.1 -r1.21.2.2
*** admin_user_ban.php 12 May 2002 00:47:40 -0000 1.21.2.1
--- admin_user_ban.php 12 May 2002 15:57:45 -0000 1.21.2.2
***************
*** 23,27 ****
define('IN_PHPBB', 1);
! if( !empty($setmodules) )
{
$filename = basename(__FILE__);
--- 23,27 ----
define('IN_PHPBB', 1);
! if ( !empty($setmodules) )
{
$filename = basename(__FILE__);
***************
*** 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);
***************
*** 41,69 ****
// Start program
//
! if( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = "";
! $email_bansql = "";
! $ip_bansql = "";
$user_list = array();
! if( isset($HTTP_POST_VARS['ban_user']) )
{
! $user_list_temp = $HTTP_POST_VARS['ban_user'];
!
! for($i = 0; $i < count($user_list_temp); $i++)
{
! $user_list[] = trim($user_list_temp[$i]);
}
}
$ip_list = array();
! 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) )
{
//
--- 41,70 ----
// Start program
//
! if ( isset($HTTP_POST_VARS['submit']) )
{
! $user_bansql = '';
! $email_bansql = '';
! $ip_bansql = '';
$user_list = array();
! if ( !empty($HTTP_POST_VARS['username']) )
{
! $this_userdata = get_userdata($HTTP_POST_VARS['username']);
! if( !$this_userdata )
{
! message_die(GENERAL_MESSAGE, $lang['No_user_id_specified'] );
}
+
+ $user_list[] = $this_userdata['user_id'];
}
$ip_list = array();
! 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) )
{
//
***************
*** 73,82 ****
$ip_1_end = $ip_range_explode[5];
! while($ip_1_counter <= $ip_1_end)
{
! $ip_2_counter = ($ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[2] : 0;
! $ip_2_end = ($ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[6];
! if($ip_2_counter == 0 && $ip_2_end == 254)
{
$ip_2_counter = 255;
--- 74,83 ----
$ip_1_end = $ip_range_explode[5];
! while ( $ip_1_counter <= $ip_1_end )
{
! $ip_2_counter = ( $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[2] : 0;
! $ip_2_end = ( $ip_1_counter < $ip_1_end ) ? 254 : $ip_range_explode[6];
! if ( $ip_2_counter == 0 && $ip_2_end == 254 )
{
$ip_2_counter = 255;
***************
*** 86,95 ****
}
! while($ip_2_counter <= $ip_2_end)
{
! $ip_3_counter = ($ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[3] : 0;
! $ip_3_end = ($ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end) ? 254 : $ip_range_explode[7];
! if($ip_3_counter == 0 && $ip_3_end == 254 )
{
$ip_3_counter = 255;
--- 87,96 ----
}
! while ( $ip_2_counter <= $ip_2_end )
{
! $ip_3_counter = ( $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[3] : 0;
! $ip_3_end = ( $ip_2_counter < $ip_2_end || $ip_1_counter < $ip_1_end ) ? 254 : $ip_range_explode[7];
! if ( $ip_3_counter == 0 && $ip_3_end == 254 )
{
$ip_3_counter = 255;
***************
*** 99,108 ****
}
! while($ip_3_counter <= $ip_3_end)
{
! $ip_4_counter = ($ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1]) ? $ip_range_explode[4] : 0;
! $ip_4_end = ($ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end) ? 254 : $ip_range_explode[8];
! if($ip_4_counter == 0 && $ip_4_end == 254)
{
$ip_4_counter = 255;
--- 100,109 ----
}
! while ( $ip_3_counter <= $ip_3_end )
{
! $ip_4_counter = ( $ip_3_counter == $ip_range_explode[3] && $ip_2_counter == $ip_range_explode[2] && $ip_1_counter == $ip_range_explode[1] ) ? $ip_range_explode[4] : 0;
! $ip_4_end = ( $ip_3_counter < $ip_3_end || $ip_2_counter < $ip_2_end ) ? 254 : $ip_range_explode[8];
! if ( $ip_4_counter == 0 && $ip_4_end == 254 )
{
$ip_4_counter = 255;
***************
*** 112,116 ****
}
! while($ip_4_counter <= $ip_4_end)
{
$ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_counter.$ip_4_counter");
--- 113,117 ----
}
! while ( $ip_4_counter <= $ip_4_end )
{
$ip_list[] = encode_ip("$ip_1_counter.$ip_2_counter.$ip_3_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]));
--- 125,129 ----
}
}
! else if ( preg_match('/^([\w\-_]\.?){2,}$/is', trim($ip_list_temp[$i])) )
{
$ip = gethostbynamel(trim($ip_list_temp[$i]));
***************
*** 130,134 ****
for($j = 0; $j < count($ip); $j++)
{
! if( !empty($ip[$j]) )
{
$ip_list[] = encode_ip($ip[$j]);
--- 131,135 ----
for($j = 0; $j < count($ip); $j++)
{
! if ( !empty($ip[$j]) )
{
$ip_list[] = encode_ip($ip[$j]);
***************
*** 136,142 ****
}
}
! 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])));
}
}
--- 137,143 ----
}
}
! 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])));
}
}
***************
*** 144,150 ****
$email_list = array();
! 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++)
--- 145,151 ----
$email_list = array();
! 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]);
--- 156,160 ----
// section)
//
! if ( eregi('^(([[:alnum:]\*]+([-_.][[:alnum:]\*]+)*\.?)|(\*))@([[:alnum:]]+([-_]?[[:alnum:]]+)*\.){1,3}([[:alnum:]]{2,6})$', trim($email_list_temp[$i])) )
{
$email_list[] = trim($email_list_temp[$i]);
***************
*** 164,168 ****
$sql = "SELECT *
FROM " . BANLIST_TABLE;
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
--- 165,169 ----
$sql = "SELECT *
FROM " . BANLIST_TABLE;
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, "Couldn't obtain banlist information", "", __LINE__, __FILE__, $sql);
***************
*** 170,175 ****
$current_banlist = $db->sql_fetchrowset($result);
! $kill_session_sql = "";
for($i = 0; $i < count($user_list); $i++)
{
--- 171,177 ----
$current_banlist = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
! $kill_session_sql = '';
for($i = 0; $i < count($user_list); $i++)
{
***************
*** 177,181 ****
for($j = 0; $j < count($current_banlist); $j++)
{
! if($user_list[$i] == $current_banlist[$j]['ban_userid'])
{
$in_banlist = true;
--- 179,183 ----
for($j = 0; $j < count($current_banlist); $j++)
{
! if ( $user_list[$i] == $current_banlist[$j]['ban_userid'] )
{
$in_banlist = true;
***************
*** 183,193 ****
}
! if(!$in_banlist)
{
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . "session_user_id = $user_list[$i]";
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
VALUES (" . $user_list[$i] . ")";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
--- 185,195 ----
}
! if ( !$in_banlist )
{
! $kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . "session_user_id = " . $user_list[$i];
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_userid)
VALUES (" . $user_list[$i] . ")";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_userid info into database", "", __LINE__, __FILE__, $sql);
***************
*** 201,205 ****
for($j = 0; $j < count($current_banlist); $j++)
{
! if($ip_list[$i] == $current_banlist[$j]['ban_ip'])
{
$in_banlist = true;
--- 203,207 ----
for($j = 0; $j < count($current_banlist); $j++)
{
! if ( $ip_list[$i] == $current_banlist[$j]['ban_ip'] )
{
$in_banlist = true;
***************
*** 207,215 ****
}
! 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
--- 209,217 ----
}
! 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
***************
*** 218,226 ****
}
! $kill_session_sql .= ( ($kill_session_sql != "") ? " OR " : "" ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
VALUES ('" . $ip_list[$i] . "')";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
--- 220,228 ----
}
! $kill_session_sql .= ( ( $kill_session_sql != '' ) ? ' OR ' : '' ) . $kill_ip_sql;
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_ip)
VALUES ('" . $ip_list[$i] . "')";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_ip info into database", "", __LINE__, __FILE__, $sql);
***************
*** 230,245 ****
//
! // Now we'll delete all entries from the
! // session table with any of the banned
! // user or IP info just entered into the
! // ban table ... this will force a session
! // initialisation resulting in an instant
! // ban
//
! if( $kill_session_sql != "" )
{
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE $kill_session_sql";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
--- 232,244 ----
//
! // Now we'll delete all entries from the session table with any of the banned
! // user or IP info just entered into the ban table ... this will force a session
! // initialisation resulting in an instant ban
//
! if ( $kill_session_sql != '' )
{
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE $kill_session_sql";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete banned sessions from database", "", __LINE__, __FILE__, $sql);
***************
*** 252,256 ****
for($j = 0; $j < count($current_banlist); $j++)
{
! if( $email_list[$i] == $current_banlist[$j]['ban_email'] )
{
$in_banlist = true;
--- 251,255 ----
for($j = 0; $j < count($current_banlist); $j++)
{
! if ( $email_list[$i] == $current_banlist[$j]['ban_email'] )
{
$in_banlist = true;
***************
*** 258,266 ****
}
! if( !$in_banlist )
{
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
--- 257,265 ----
}
! if ( !$in_banlist )
{
$sql = "INSERT INTO " . BANLIST_TABLE . " (ban_email)
VALUES ('" . str_replace("\'", "''", $email_list[$i]) . "')";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert ban_email info into database", "", __LINE__, __FILE__, $sql);
***************
*** 269,275 ****
}
! $where_sql = "";
! if(isset($HTTP_POST_VARS['unban_user']))
{
$user_list = $HTTP_POST_VARS['unban_user'];
--- 268,274 ----
}
! $where_sql = '';
! if ( isset($HTTP_POST_VARS['unban_user']) )
{
$user_list = $HTTP_POST_VARS['unban_user'];
***************
*** 277,292 ****
for($i = 0; $i < count($user_list); $i++)
{
! if($user_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= ", ";
! }
! $where_sql .= $user_list[$i];
}
}
}
! if( isset($HTTP_POST_VARS['unban_ip']) )
{
$ip_list = $HTTP_POST_VARS['unban_ip'];
--- 276,287 ----
for($i = 0; $i < count($user_list); $i++)
{
! if ( $user_list[$i] != -1 )
{
! $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $user_list[$i];
}
}
}
! if ( isset($HTTP_POST_VARS['unban_ip']) )
{
$ip_list = $HTTP_POST_VARS['unban_ip'];
***************
*** 294,309 ****
for($i = 0; $i < count($ip_list); $i++)
{
! if($ip_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= ", ";
! }
! $where_sql .= $ip_list[$i];
}
}
}
! if( isset($HTTP_POST_VARS['unban_email']) )
{
$email_list = $HTTP_POST_VARS['unban_email'];
--- 289,300 ----
for($i = 0; $i < count($ip_list); $i++)
{
! if ( $ip_list[$i] != -1 )
{
! $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $ip_list[$i];
}
}
}
! if ( isset($HTTP_POST_VARS['unban_email']) )
{
$email_list = $HTTP_POST_VARS['unban_email'];
***************
*** 311,330 ****
for($i = 0; $i < count($email_list); $i++)
{
! if($email_list[$i] != -1)
{
! if($where_sql != "")
! {
! $where_sql .= ", ";
! }
! $where_sql .= $email_list[$i];
}
}
}
! if( $where_sql != "" )
{
$sql = "DELETE FROM " . BANLIST_TABLE . "
WHERE ban_id IN ($where_sql)";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
--- 302,317 ----
for($i = 0; $i < count($email_list); $i++)
{
! if ( $email_list[$i] != -1 )
{
! $where_sql .= ( ( $where_sql != '' ) ? ', ' : '' ) . $email_list[$i];
}
}
}
! if ( $where_sql != '' )
{
$sql = "DELETE FROM " . BANLIST_TABLE . "
WHERE ban_id IN ($where_sql)";
! if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't delete ban info from database", "", __LINE__, __FILE__, $sql);
***************
*** 332,336 ****
}
! $message = $lang['Ban_update_sucessful'] . "<br /><br />" . sprintf($lang['Click_return_banadmin'], "<a href=\"" . append_sid("admin_user_ban.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
--- 319,323 ----
}
! $message = $lang['Ban_update_sucessful'] . '<br /><br />' . sprintf($lang['Click_return_banadmin'], '<a href="' . append_sid("admin_user_ban.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
***************
*** 355,380 ****
);
- $userban_count = 0;
-
- $sql = "SELECT user_id, username
- FROM " . USERS_TABLE . "
- 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'],
--- 342,345 ----
***************
*** 383,389 ****
'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)
);
--- 348,352 ----
'L_BAN_IP_EXPLAIN' => $lang['Ban_IP_explain'],
'L_BAN_EMAIL' => $lang['Ban_email'],
! 'L_BAN_EMAIL_EXPLAIN' => $lang['Ban_email_explain'])
);
***************
*** 470,475 ****
'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,
--- 433,442 ----
'L_UNBAN_IP_EXPLAIN' => $lang['Unban_IP_explain'],
'L_UNBAN_EMAIL' => $lang['Unban_email'],
! 'L_UNBAN_EMAIL_EXPLAIN' => $lang['Unban_email_explain'],
! 'L_USERNAME' => $lang['Username'],
! 'L_LOOK_UP' => $lang['Look_up_User'],
! 'L_FIND_USERNAME' => $lang['Find_username'],
+ 'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"),
'S_UNBAN_USERLIST_SELECT' => $select_userlist,
'S_UNBAN_IPLIST_SELECT' => $select_iplist,
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.57.2.1
retrieving revision 1.57.2.2
diff -C2 -r1.57.2.1 -r1.57.2.2
*** admin_users.php 12 May 2002 00:47:40 -0000 1.57.2.1
--- admin_users.php 12 May 2002 15:57:45 -0000 1.57.2.2
***************
*** 160,167 ****
{
unset($rename_user);
! if( !validate_username($username) )
{
$error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Invalid_username'];
}
else
--- 160,169 ----
{
unset($rename_user);
!
! $result = validate_username($username);
! if ( $result['error'] )
{
$error = TRUE;
! $error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $result['error_msg'];
}
else
***************
*** 972,976 ****
'L_SPECIAL' => $lang['User_special'],
! 'L_SPECIAL_EXPLAIN' => $lang['User_specail_explain'],
'L_USER_ACTIVE' => $lang['User_status'],
'L_ALLOW_PM' => $lang['User_allowpm'],
--- 974,978 ----
'L_SPECIAL' => $lang['User_special'],
! 'L_SPECIAL_EXPLAIN' => $lang['User_special_explain'],
'L_USER_ACTIVE' => $lang['User_status'],
'L_ALLOW_PM' => $lang['User_allowpm'],
***************
*** 1036,1052 ****
// Default user selection box
//
- $sql = "SELECT user_id, username
- FROM " . USERS_TABLE . "
- WHERE user_id <> " . ANONYMOUS ."
- ORDER BY username";
- $result = $db->sql_query($sql);
-
- $select_list = '<select name="' . POST_USERS_URL . '">';
- while( $row = $db->sql_fetchrow($result) )
- {
- $select_list .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
- }
- $select_list .= '</select>';
-
$template->set_filenames(array(
'body' => 'admin/user_select_body.tpl')
--- 1038,1041 ----
***************
*** 1060,1064 ****
'L_FIND_USERNAME' => $lang['Find_username'],
! 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"),
'S_USER_ACTION' => append_sid("admin_users.$phpEx"),
--- 1049,1053 ----
'L_FIND_USERNAME' => $lang['Find_username'],
! 'U_SEARCH_USER' => append_sid("./../search.$phpEx?mode=searchuser"),
'S_USER_ACTION' => append_sid("admin_users.$phpEx"),
***************
*** 1071,1073 ****
include('./page_footer_admin.'.$phpEx);
! ?>
--- 1060,1062 ----
include('./page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
Index: admin_words.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_words.php,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -r1.10.2.1 -r1.10.2.2
*** admin_words.php 12 May 2002 00:47:40 -0000 1.10.2.1
--- admin_words.php 12 May 2002 15:57:45 -0000 1.10.2.2
***************
*** 173,177 ****
else
{
! message_die(GENERAL_MESSAGE, $lang['Must_specify_word']);
}
}
--- 173,177 ----
else
{
! message_die(GENERAL_MESSAGE, $lang['No_word_selected']);
}
}
Index: page_footer_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_footer_admin.php,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -C2 -r1.9.2.1 -r1.9.2.2
*** page_footer_admin.php 4 Apr 2002 14:47:18 -0000 1.9.2.1
--- page_footer_admin.php 12 May 2002 15:57:45 -0000 1.9.2.2
***************
*** 63,67 ****
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo '\x1f\x8b\x08\x00\x00\x00\x00\x00';
echo $gzip_contents;
echo pack('V', $gzip_crc);
--- 63,67 ----
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
! echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
echo $gzip_contents;
echo pack('V', $gzip_crc);
Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/page_header_admin.php,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -r1.12.2.1 -r1.12.2.2
*** page_header_admin.php 12 May 2002 00:47:40 -0000 1.12.2.1
--- page_header_admin.php 12 May 2002 15:57:45 -0000 1.12.2.2
***************
*** 32,51 ****
//
$do_gzip_compress = FALSE;
! if($board_config['gzip_compress'])
{
$phpver = phpversion();
! if($phpver >= '4.0.4pl1')
{
! if(extension_loaded('zlib'))
{
ob_start('ob_gzhandler');
}
}
! else if($phpver > '4.0')
{
! if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip'))
{
! if(extension_loaded('zlib'))
{
$do_gzip_compress = TRUE;
--- 32,51 ----
//
$do_gzip_compress = FALSE;
! if ( $board_config['gzip_compress'] )
{
$phpver = phpversion();
! if ( $phpver >= '4.0.4pl1' && strstr($HTTP_USER_AGENT,'compatible') )
{
! if ( extension_loaded('zlib') )
{
ob_start('ob_gzhandler');
}
}
! else if ( $phpver > '4.0' )
{
! if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
{
! if ( extension_loaded('zlib') )
{
$do_gzip_compress = TRUE;
***************
*** 73,100 ****
'L_ADMIN' => $lang['Admin'],
- 'L_USERNAME' => $lang['Username'],
- 'L_PASSWORD' => $lang['Password'],
'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']),
- 'L_REGISTER' => $lang['Register'],
- 'L_PROFILE' => $lang['Profile'],
- 'L_SEARCH' => $lang['Search'],
- 'L_PRIVATEMSGS' => $lang['Private_msgs'],
- 'L_MEMBERLIST' => $lang['Memberlist'],
'L_FAQ' => $lang['FAQ'],
- 'L_USERGROUPS' => $lang['Usergroups'],
- 'L_FORUM' => $lang['Forum'],
- 'L_TOPICS' => $lang['Topics'],
- 'L_REPLIES' => $lang['Replies'],
- 'L_VIEWS' => $lang['Views'],
- 'L_POSTS' => $lang['Posts'],
- 'L_LASTPOST' => $lang['Last_Post'],
- 'L_MODERATOR' => $lang['Moderator'],
- 'L_NONEWPOSTS' => $lang['No_new_posts'],
- 'L_NEWPOSTS' => $lang['New_posts'],
- 'L_POSTED' => $lang['Posted'],
- 'L_JOINED' => $lang['Joined'],
- 'L_AUTHOR' => $lang['Author'],
- 'L_MESSAGE' => $lang['Message'],
- 'L_BY' => $lang['by'],
'U_INDEX' => append_sid('../index.'.$phpEx),
--- 73,78 ----
|
