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

FIX #16671 Can not generate zip file of documents in backup tool

Browse Source
This commit is contained in:
Laurent Destailleur 2021-03-15 14:51:36 +01:00
parent 7bbcf4aa00
commit 614720fc0a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/tools/export_files.php
View File

@ -113,7 +113,8 @@ $utils = new Utils($db);
if ($compression == 'zip') if ($compression == 'zip')
{ {
$file .= '.zip'; $file .= '.zip';
$ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.back|\.old|\.log|[\\\/]temp[\\\/]|documents[\\\/]admin[\\\/]documents[\\\/])/i'); $excludefiles = '/(\.back|\.old|\.log|[\/\\\]temp[\/\\\]|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
$ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, $excludefiles);
if ($ret < 0) if ($ret < 0)
{ {
if ($ret == -2) { if ($ret == -2) {

7
test/phpunit/FilesLibTest.php
View File

@ -425,6 +425,13 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
$result=dol_uncompress($fileout, $dirout); $result=dol_uncompress($fileout, $dirout);
print __METHOD__." result=".join(',', $result)."\n"; print __METHOD__." result=".join(',', $result)."\n";
$this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout); $this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout);
$excludefiles = '/(\.back|\.old|\.log|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
if (preg_match($excludefiles, 'a/temp/b')) { echo '----- Regex OK -----'."\n"; }
$result=dol_compress_dir($dirout, $conf->admin->dir_temp.'/testdir.zip', 'zip', $excludefiles);
print __METHOD__." result=".$result."\n";
print join(', ', $conf->logbuffer);
$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_dir of ".$dirout." into ".$conf->admin->dir_temp.'/testdir.zip');
} }
/** /**