Skip to content

Commit

Permalink
This commit was manufactured by cvs2svn to create tag
Browse files Browse the repository at this point in the history 
'release_2_0_1'.

git-svn-id: file:///svn/phpbb/tags/release_2_0_1@2610 89ea8834-ac86-4346-8a33-228a782c2dd0
  • Loading branch information
(no author) committed May 20, 2002
1 parent a676b8f commit 012267a
Show file tree
Hide file tree
Showing 536 changed files with 16,096 additions and 11,142 deletions.
6 changes: 3 additions & 3 deletions phpBB/admin/admin_board.php
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
// //
// Let's set the root dir for phpBB // Let's set the root dir for phpBB
// //
$phpbb_root_path = "../"; $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc'); require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx); require('./pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/functions_selects.'.$phpEx); include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);


// //
Expand Down Expand Up @@ -311,6 +311,6 @@


$template->pparse("body"); $template->pparse("body");


include('page_footer_admin.'.$phpEx); include('./page_footer_admin.'.$phpEx);


?> ?>
36 changes: 17 additions & 19 deletions phpBB/admin/admin_db_utilities.php
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
{ {
$file_uploads = @get_cfg_var('file_uploads'); $file_uploads = @get_cfg_var('file_uploads');
} }

if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') ) if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
{ {
$module['General']['Restore_DB'] = $filename . "?perform=restore"; $module['General']['Restore_DB'] = $filename . "?perform=restore";
Expand All @@ -54,9 +55,9 @@
// Load default header // Load default header
// //
$no_page_header = TRUE; $no_page_header = TRUE;
$phpbb_root_path = "../"; $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc'); require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx); require('./pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/sql_parse.'.$phpEx); include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);


// //
Expand Down Expand Up @@ -695,7 +696,7 @@ function output_table_content($content)
break; break;
} }


include('page_header_admin.'.$phpEx); include('./page_header_admin.'.$phpEx);


$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/admin_message_body.tpl") "body" => "admin/admin_message_body.tpl")
Expand Down Expand Up @@ -740,12 +741,11 @@ function output_table_content($content)


if( !isset($HTTP_POST_VARS['backupstart']) && !isset($HTTP_GET_VARS['backupstart'])) if( !isset($HTTP_POST_VARS['backupstart']) && !isset($HTTP_GET_VARS['backupstart']))
{ {
include('page_header_admin.'.$phpEx); include('./page_header_admin.'.$phpEx);


$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/db_utils_backup_body.tpl") "body" => "admin/db_utils_backup_body.tpl")
); );

$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />"; $s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"backup\" /><input type=\"hidden\" name=\"drop\" value=\"1\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";


$template->assign_vars(array( $template->assign_vars(array(
Expand All @@ -771,22 +771,26 @@ function output_table_content($content)
} }
else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) ) else if( !isset($HTTP_POST_VARS['startdownload']) && !isset($HTTP_GET_VARS['startdownload']) )
{ {
if(is_array($additional_tables))
{
$additional_tables = implode(',', $additional_tables);
}
$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/admin_message_body.tpl") "body" => "admin/admin_message_body.tpl")
); );


$template->assign_vars(array( $template->assign_vars(array(
"META" => "<meta http-equiv=\"refresh\" content=\"0;url=admin_db_utilities.$phpEx?perform=backup&amp;additional_tables=" . quotemeta($additional_tables) . "&amp;backup_type=$backup_type&amp;drop=1&amp;backupstart=1&amp;gzipcompress=$gzipcompress&amp;startdownload=1\">", "META" => "<meta http-equiv=\"refresh\" content=\"2;url=admin_db_utilities.$phpEx?perform=backup&additional_tables=" . quotemeta($additional_tables) . "&backup_type=$backup_type&drop=1&amp;backupstart=1&gzipcompress=$gzipcompress&startdownload=1\">",


"MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'], "MESSAGE_TITLE" => $lang['Database_Utilities'] . " : " . $lang['Backup'],
"MESSAGE_TEXT" => $lang['Backup_download']) "MESSAGE_TEXT" => $lang['Backup_download'])
); );


include('page_header_admin.php'); include('./page_header_admin.'.$phpEx);


$template->pparse("body"); $template->pparse("body");


include('page_footer_admin.'.$phpEx); include('./page_footer_admin.'.$phpEx);


} }
header("Pragma: no-cache"); header("Pragma: no-cache");
Expand All @@ -807,7 +811,7 @@ function output_table_content($content)
{ {
@ob_start(); @ob_start();
@ob_implicit_flush(0); @ob_implicit_flush(0);
header("Content-Type: text/x-delimtext; name=\"phpbb_db_backup.sql.gz\""); header("Content-Type: application/x-gzip; name=\"phpbb_db_backup.sql.gz\"");
header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz"); header("Content-disposition: attachment; filename=phpbb_db_backup.sql.gz");
} }
else else
Expand Down Expand Up @@ -873,7 +877,7 @@ function output_table_content($content)
// //
// Define Template files... // Define Template files...
// //
include('page_header_admin.'.$phpEx); include('./page_header_admin.'.$phpEx);


$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/db_utils_restore_body.tpl") "body" => "admin/db_utils_restore_body.tpl")
Expand Down Expand Up @@ -907,7 +911,6 @@ function output_table_content($content)


if($backup_file_tmpname == "" || $backup_file_name == "") if($backup_file_tmpname == "" || $backup_file_name == "")
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_MESSAGE, $lang['Restore_Error_no_file']); message_die(GENERAL_MESSAGE, $lang['Restore_Error_no_file']);
} }
// //
Expand Down Expand Up @@ -943,7 +946,6 @@ function output_table_content($content)
} }
else else
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_decompress']); message_die(GENERAL_ERROR, $lang['Restore_Error_decompress']);
} }
} }
Expand All @@ -958,13 +960,11 @@ function output_table_content($content)
} }
else else
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] ." $backup_file_type $backup_file_name"); message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] ." $backup_file_type $backup_file_name");
} }
} }
else else
{ {
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_uploading']); message_die(GENERAL_ERROR, $lang['Restore_Error_uploading']);
} }


Expand All @@ -991,15 +991,13 @@ function output_table_content($content)


if(!$result && ( !(SQL_LAYER == 'postgresql' && eregi("drop table", $sql) ) ) ) if(!$result && ( !(SQL_LAYER == 'postgresql' && eregi("drop table", $sql) ) ) )
{ {
//include('page_header_admin.'.$phpEx);
// echo "~~$sql~~";
message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Error importing backup file", "", __LINE__, __FILE__, $sql);
} }
} }
} }
} }


include('page_header_admin.'.$phpEx); include('./page_header_admin.'.$phpEx);


$template->set_filenames(array( $template->set_filenames(array(
"body" => "admin/admin_message_body.tpl") "body" => "admin/admin_message_body.tpl")
Expand All @@ -1019,6 +1017,6 @@ function output_table_content($content)
} }
} }


include('page_footer_admin.'.$phpEx); include('./page_footer_admin.'.$phpEx);


?> ?>
9 changes: 4 additions & 5 deletions phpBB/admin/admin_disallow.php
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,16 +33,15 @@
// //
// Include required files, get $phpEx and check permissions // Include required files, get $phpEx and check permissions
// //
$phpbb_root_path = "../"; $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc'); require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx); require('./pagestart.' . $phpEx);


if( isset($HTTP_POST_VARS['add_name']) ) if( isset($HTTP_POST_VARS['add_name']) )
{ {
include($phpbb_root_path . 'includes/functions_validate.'.$phpEx); 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 = ( isset($HTTP_POST_VARS['disallowed_user']) ) ? $HTTP_POST_VARS['disallowed_user'] : $HTTP_GET_VARS['disallowed_user'];
$disallowed_user = preg_replace( '/\*/', '%', $disallowed_user );


if( !validate_username($disallowed_user) ) if( !validate_username($disallowed_user) )
{ {
Expand Down Expand Up @@ -110,8 +109,6 @@
$user = array(); $user = array();
for( $i = 0; $i < count($disallowed); $i++ ) for( $i = 0; $i < count($disallowed); $i++ )
{ {
$disallowed[$i]['disallow_username'] = preg_replace('/%/', '*', $disallowed[$i]['disallow_username']);

$disallow_select .= '<option value="' . $disallowed[$i]['disallow_id'] . '">' . $disallowed[$i]['disallow_username'] . '</option>'; $disallow_select .= '<option value="' . $disallowed[$i]['disallow_id'] . '">' . $disallowed[$i]['disallow_username'] . '</option>';
} }
} }
Expand Down Expand Up @@ -140,4 +137,6 @@


$template->pparse("body"); $template->pparse("body");


include('./page_footer_admin.'.$phpEx);

?> ?>
7 changes: 4 additions & 3 deletions phpBB/admin/admin_forum_prune.php
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
// //
// Load default header // Load default header
// //
$phpbb_root_path = '../'; $phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc'); require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx); require('./pagestart.' . $phpEx);
require($phpbb_root_path . 'includes/prune.'.$phpEx); require($phpbb_root_path . 'includes/prune.'.$phpEx);
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx); require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);


Expand Down Expand Up @@ -178,6 +178,7 @@
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_NAME' => $forum_name, 'FORUM_NAME' => $forum_name,


'L_FORUM' => $lang['Forum'],
'L_FORUM_PRUNE' => $lang['Forum_Prune'], 'L_FORUM_PRUNE' => $lang['Forum_Prune'],
'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'], 'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'],
'L_DO_PRUNE' => $lang['Do_Prune'], 'L_DO_PRUNE' => $lang['Do_Prune'],
Expand All @@ -193,6 +194,6 @@
// //
$template->pparse('body'); $template->pparse('body');


include('page_footer_admin.'.$phpEx); include('./page_footer_admin.'.$phpEx);


?> ?>
Loading

0 comments on commit 012267a

Please sign in to comment.