Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Conflicts: htdocs/modulebuilder/index.php
Dolibarr · Jan 15, 2020 · c8ff847 · c8ff847
2 parents 14d59f4 + 0442105
commit c8ff847
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
@@ -2082,9 +2082,10 @@ function dol_uncompress($inputfile, $outputdir)
  * @param 	string	$outputfile		Target file name (output directory must exists and be writable)
  * @param 	string	$mode			'zip'
  * @param	string	$excludefiles   A regex pattern. For example: '/\.log$|\/temp\//'
+ * @param	string	$rootdirinzip	Add a root dir level in zip file
  * @return	int						<0 if KO, >0 if OK
  */
-function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '')
+function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles = '', $rootdirinzip = '')
 {
 	$foundhandler=0;
 
@@ -2145,7 +2146,8 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 					{
 						// Get real and relative path for current file
 						$filePath = $file->getRealPath();
-						$relativePath = substr($filePath, strlen($inputdir) + 1);
+						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen($inputdir) + 1);
+
 						if (empty($excludefiles) || ! preg_match($excludefiles, $filePath))
 						{
 							// Add current file to archive

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
@@ -1307,7 +1307,7 @@
 		if ($dirofmodule)
 		{
 			if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
-			$result = dol_compress_dir($dir, $outputfilezip, 'zip');
+			$result = dol_compress_dir($dir, $outputfilezip, 'zip', '', $modulelowercase);
 		}
 		else
 		{