lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: La sauvegarde dump au format compress gz et bz2 ne fonctionnait pas.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-09-22 02:25:32 +00:00
parent b67a243e40
commit 05a3e447f4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/tools/dolibarr_export.php
View File

@ -512,8 +512,8 @@ print $langs->trans("Compression").':   ';
$compression=array( $compression=array(
'none' => array('function' => '', 'id' => 'radio_compression_none', 'label' => $langs->trans("None")), 'none' => array('function' => '', 'id' => 'radio_compression_none', 'label' => $langs->trans("None")),
// 'zip' => array('function' => 'zip_open', 'id' => 'radio_compression_zip', 'label' => $langs->trans("Zip")), Not open source // 'zip' => array('function' => 'zip_open', 'id' => 'radio_compression_zip', 'label' => $langs->trans("Zip")), Not open source
'gz' => array('function' => 'gz_open', 'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip")), 'gz' => array('function' => 'gzopen', 'id' => 'radio_compression_gzip', 'label' => $langs->trans("Gzip")),
'bz' => array('function' => 'bz_open', 'id' => 'radio_compression_bzip', 'label' => $langs->trans("Bzip2")) 'bz' => array('function' => 'bzopen', 'id' => 'radio_compression_bzip', 'label' => $langs->trans("Bzip2"))
); );
foreach($compression as $key => $val) foreach($compression as $key => $val)

6
htdocs/admin/tools/export.php
View File

@ -115,6 +115,9 @@ if ($what == 'mysql')
$param.=" -d"; $param.=" -d";
} }
$relativepathfile='/admin/temp/'.$file; $relativepathfile='/admin/temp/'.$file;
// for compression format, we add extension
if ($compression == 'gz') $relativepathfile.='.gz';
if ($compression == 'bz') $relativepathfile.='.bz2';
$relativepatherr=$relativepathfile.'.err'; $relativepatherr=$relativepathfile.'.err';
$outputfile=DOL_DATA_ROOT.$relativepathfile; $outputfile=DOL_DATA_ROOT.$relativepathfile;
$outputerror=DOL_DATA_ROOT.$relativepatherr; $outputerror=DOL_DATA_ROOT.$relativepatherr;
@ -149,8 +152,7 @@ if ($what == 'mysql')
if ($compression == 'none') $handle = fopen($outputfile, 'r'); if ($compression == 'none') $handle = fopen($outputfile, 'r');
if ($compression == 'gz') $handle = gzopen($outputfile, 'r'); if ($compression == 'gz') $handle = gzopen($outputfile, 'r');
if ($compression == 'bz') $handle = bzopen($outputfile, 'r'); if ($compression == 'bz') $handle = bzopen($outputfile, 'r');
$handle = fopen($outputfile, "r"); $errormsg = fgets($handle,10);
$errormsg = fgets($handle);
if ($compression == 'none') fclose($handle); if ($compression == 'none') fclose($handle);
if ($compression == 'gz') gzclose($handle); if ($compression == 'gz') gzclose($handle);
if ($compression == 'bz') bzclose($handle); if ($compression == 'bz') bzclose($handle);