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

Dolibarr · Mar 15, 2021 · 614720f · 614720f · xusdeejay · Mar 16, 2021
1 parent 7bbcf4a
commit 614720f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
@@ -113,7 +113,8 @@
 if ($compression == '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 == -2) {

diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
@@ -425,6 +425,13 @@ public function testDolCompressUnCompress()
         $result=dol_uncompress($fileout, $dirout);
         print __METHOD__." result=".join(',', $result)."\n";
         $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');
     }
 
     /**