makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added gzip decompression for uploaded file

Browse source 
git-svn-id: file:///svn/phpbb/trunk@807 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-08-03 16:24:20 +00:00
parent c04d661960
commit 07fe228a48
2 changed files with 52 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
phpBB/admin/admin_db_utilities.php
View file

@ -942,7 +942,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
"body" => "admin/db_utils_restore_body.tpl") "body" => "admin/db_utils_restore_body.tpl")
); );
$s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"restore\"><input type=\"hidden\" name=\"perform\" value=\"$perform\">"; $s_hidden_fields = "<input type=\"hidden\" name=\"perform\" value=\"restore\" /><input type=\"hidden\" name=\"perform\" value=\"$perform\" />";
$template->assign_vars(array( $template->assign_vars(array(
"L_DATABASE_RESTORE" => $lang['Database_Utilities'] . " : " . $lang['Restore'], "L_DATABASE_RESTORE" => $lang['Database_Utilities'] . " : " . $lang['Restore'],
@ -964,10 +964,14 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
// Handle the file upload .... // Handle the file upload ....
// If no file was uploaded report an error... // If no file was uploaded report an error...
// //
if($backup_file == "none") $backup_file_name = (!empty($HTTP_POST_FILES['backup_file']['name'])) ? $HTTP_POST_FILES['backup_file']['name'] : "";
$backup_file_tmpname = ($HTTP_POST_FILES['backup_file']['tmp_name'] != "none") ? $HTTP_POST_FILES['backup_file']['tmp_name'] : "";
$backup_file_type = (!empty($HTTP_POST_FILES['backup_file']['type'])) ? $HTTP_POST_FILES['backup_file']['type'] : "";
if($backup_file_tmpname == "" || $backup_file_name == "")
{ {
include('page_header_admin.'.$phpEx); include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Backup file upload failed"); message_die(GENERAL_MESSAGE, $lang['Restore_Error_no_file']);
} }
// //
// If I file was actually uploaded, check to make sure that we // If I file was actually uploaded, check to make sure that we
@ -975,18 +979,51 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) )
// a hackers attempt at getting us to process a local system // a hackers attempt at getting us to process a local system
// file. // file.
// //
if(ereg("^php[0-9A-Za-z_.-]+$", basename($backup_file))) if( file_exists($backup_file_tmpname) )
{ {
$sql_query = fread(fopen($backup_file, 'r'), filesize($backup_file)); if( preg_match("/^(text\/[a-zA-Z]+)|(application\/(x\-)?gzip\-compressed)$/is", $backup_file_type) )
// {
// Comment this line out to see if this fixes the stuff... if( preg_match("/\.gz$/is",$backup_file_name) )
// {
//$sql_query = stripslashes($sql_query); $do_gzip_compress = FALSE;
$phpver = phpversion();
if($phpver >= "4.0")
{
if(extension_loaded("zlib"))
{
$do_gzip_compress = TRUE;
}
}
if($do_gzip_compress)
{
$sql_query = gzread(gzopen($backup_file_tmpname, 'rb'), filesize($backup_file_tmpname));
}
else
{
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_decompress']);
}
}
else
{
$sql_query = fread(fopen($backup_file_tmpname, 'r'), filesize($backup_file_tmpname));
}
//
// Comment this line out to see if this fixes the stuff...
//
//$sql_query = stripslashes($sql_query);
}
else
{
include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, $lang['Restore_Error_filename']);
}
} }
else else
{ {
include('page_header_admin.'.$phpEx); include('page_header_admin.'.$phpEx);
message_die(GENERAL_ERROR, "Trouble Accessing uploaded file"); message_die(GENERAL_ERROR, $lang['Restore_Error_uploading']);
} }
$sql_query = trim($sql_query); $sql_query = trim($sql_query);

5
phpBB/language/lang_english.php
View file

@ -686,6 +686,11 @@ $lang['Restore_success'] = "The Database has been successfully restored.<br /><b
$lang['Backup_download'] = "Your download will start shortly please wait till it begins"; $lang['Backup_download'] = "Your download will start shortly please wait till it begins";
$lang['Backups_not_supported'] = "Sorry but database backups are not currently supported for your database system"; $lang['Backups_not_supported'] = "Sorry but database backups are not currently supported for your database system";
$lang['Restore_Error_uploading'] = "Error in uploading the backup file";
$lang['Restore_Error_filename'] = "Filename problem, please try an alternative file";
$lang['Restore_Error_decompress'] = "Cannot decompress a gzip file, please upload a plain text version";
$lang['Restore_Error_no_file'] = "No file was uploaded";
// Auth pages // Auth pages
$lang['Administrator'] = "Administrator"; $lang['Administrator'] = "Administrator";
$lang['User'] = "User"; $lang['User'] = "User";