Permalink
Browse files

This commit was manufactured by cvs2svn to create tag

'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)
(no author) committed May 20, 2002
1 parent a676b8f commit 012267ad5e959018109344c1d5ef720a62aa3fb5
Showing 536 changed files with 16,096 additions and 11,142 deletions.
@@ -23,9 +23,9 @@
//
// Let's set the root dir for phpBB
//
-$phpbb_root_path = "../";
+$phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
-require('pagestart.' . $phpEx);
+require('./pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/functions_selects.'.$phpEx);
//
@@ -311,6 +311,6 @@
$template->pparse("body");
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
?>
@@ -42,6 +42,7 @@
{
$file_uploads = @get_cfg_var('file_uploads');
}
+
if( ($file_uploads != 0 || empty($file_uploads)) && (strtolower($file_uploads) != 'off') && (@phpversion() != '4.0.4pl1') )
{
$module['General']['Restore_DB'] = $filename . "?perform=restore";
@@ -54,9 +55,9 @@
// Load default header
//
$no_page_header = TRUE;
-$phpbb_root_path = "../";
+$phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
-require('pagestart.' . $phpEx);
+require('./pagestart.' . $phpEx);
include($phpbb_root_path . 'includes/sql_parse.'.$phpEx);
//
@@ -695,7 +696,7 @@ function output_table_content($content)
break;
}
- include('page_header_admin.'.$phpEx);
+ include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
"body" => "admin/admin_message_body.tpl")
@@ -740,12 +741,11 @@ function output_table_content($content)
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(
"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\" />";
$template->assign_vars(array(
@@ -771,22 +771,26 @@ function output_table_content($content)
}
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(
"body" => "admin/admin_message_body.tpl")
);
$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_TEXT" => $lang['Backup_download'])
);
- include('page_header_admin.php');
+ include('./page_header_admin.'.$phpEx);
$template->pparse("body");
- include('page_footer_admin.'.$phpEx);
+ include('./page_footer_admin.'.$phpEx);
}
header("Pragma: no-cache");
@@ -807,7 +811,7 @@ function output_table_content($content)
{
@ob_start();
@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");
}
else
@@ -873,7 +877,7 @@ function output_table_content($content)
//
// Define Template files...
//
- include('page_header_admin.'.$phpEx);
+ include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
"body" => "admin/db_utils_restore_body.tpl")
@@ -907,7 +911,6 @@ function output_table_content($content)
if($backup_file_tmpname == "" || $backup_file_name == "")
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_MESSAGE, $lang['Restore_Error_no_file']);
}
//
@@ -943,7 +946,6 @@ function output_table_content($content)
}
else
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_decompress']);
}
}
@@ -958,13 +960,11 @@ function output_table_content($content)
}
else
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_filename'] ." $backup_file_type $backup_file_name");
}
}
else
{
- include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_uploading']);
}
@@ -991,15 +991,13 @@ function output_table_content($content)
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);
}
}
}
}
- include('page_header_admin.'.$phpEx);
+ include('./page_header_admin.'.$phpEx);
$template->set_filenames(array(
"body" => "admin/admin_message_body.tpl")
@@ -1019,6 +1017,6 @@ function output_table_content($content)
}
}
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
?>
@@ -33,16 +33,15 @@
//
// Include required files, get $phpEx and check permissions
//
-$phpbb_root_path = "../";
+$phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
-require('pagestart.' . $phpEx);
+require('./pagestart.' . $phpEx);
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 );
if( !validate_username($disallowed_user) )
{
@@ -110,8 +109,6 @@
$user = array();
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>';
}
}
@@ -140,4 +137,6 @@
$template->pparse("body");
+include('./page_footer_admin.'.$phpEx);
+
?>
@@ -32,9 +32,9 @@
//
// Load default header
//
-$phpbb_root_path = '../';
+$phpbb_root_path = "./../";
require($phpbb_root_path . 'extension.inc');
-require('pagestart.' . $phpEx);
+require('./pagestart.' . $phpEx);
require($phpbb_root_path . 'includes/prune.'.$phpEx);
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
@@ -178,6 +178,7 @@
$template->assign_vars(array(
'FORUM_NAME' => $forum_name,
+ 'L_FORUM' => $lang['Forum'],
'L_FORUM_PRUNE' => $lang['Forum_Prune'],
'L_FORUM_PRUNE_EXPLAIN' => $lang['Forum_Prune_explain'],
'L_DO_PRUNE' => $lang['Do_Prune'],
@@ -193,6 +194,6 @@
//
$template->pparse('body');
-include('page_footer_admin.'.$phpEx);
+include('./page_footer_admin.'.$phpEx);
?>
Oops, something went wrong.

0 comments on commit 012267a

Please sign in to comment.