nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed saving compressed dumps on server.

Browse Source
This commit is contained in:
Michal Čihař
2003-06-14 08:03:33 +00:00
parent 9b8137f850
commit 1fdc8c0a4f
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-06-14 Michal Cihar <nijel@users.sourceforge.net>
* export.php3: Fixed saving compressed dumps on server.
2003-06-13 Marc Delisle <lem9@users.sourceforge.net> 2003-06-13 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.data.php3: bug 753813, "session" is not * libraries/sqlparser.data.php3: bug 753813, "session" is not
a reserved word a reserved word

15
export.php3
View File

@@ -387,13 +387,13 @@ if (!empty($asfile)) {
} }
$zipfile = new zipfile(); $zipfile = new zipfile();
$zipfile -> addFile($dump_buffer, $filename . $extbis); $zipfile -> addFile($dump_buffer, $filename . $extbis);
echo $zipfile -> file(); $dump_buffer = $zipfile -> file();
} }
} }
// 2. as a bzipped file // 2. as a bzipped file
else if (isset($compression) && $compression == 'bzip') { else if (isset($compression) && $compression == 'bzip') {
if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('bzcompress')) { if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('bzcompress')) {
echo bzcompress($dump_buffer); $dump_buffer = bzcompress($dump_buffer);
// nijel: eval in next line is because otherwise === causes syntax error on php3 // nijel: eval in next line is because otherwise === causes syntax error on php3
if (eval('return($dump_buffer === -8);')) { if (eval('return($dump_buffer === -8);')) {
include('./header.inc.php3'); include('./header.inc.php3');
@@ -407,14 +407,19 @@ if (!empty($asfile)) {
else if (isset($compression) && $compression == 'gzip') { else if (isset($compression) && $compression == 'gzip') {
if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('gzencode')) { if (PMA_PHP_INT_VERSION >= 40004 && @function_exists('gzencode')) {
// without the optional parameter level because it bug // without the optional parameter level because it bug
echo gzencode($dump_buffer); $dump_buffer = gzencode($dump_buffer);
} }
} }
/* If ve saved on server, we have to close file now */ /* If ve saved on server, we have to close file now */
if ($save_on_server) { if ($save_on_server) {
$write_result = @fwrite($file_handle, $dump_buffer);
fclose($file_handle); fclose($file_handle);
$message = sprintf($strDumpSaved, $save_filename); if (strlen($dump_buffer) !=0 && (!$write_result || ($write_result != strlen($dump_buffer)))) {
$message = sprintf($strNoSpace, $save_filename);
} else {
$message = sprintf($strDumpSaved, $save_filename);
}
$js_to_run = 'functions.js'; $js_to_run = 'functions.js';
include('./header.inc.php3'); include('./header.inc.php3');
@@ -429,6 +434,8 @@ if (!empty($asfile)) {
include('./tbl_properties_export.php3'); include('./tbl_properties_export.php3');
} }
exit(); exit();
} else {
echo $dump_buffer;
} }
} }
/** /**