Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/modulebuilder/index.php
This commit is contained in:
Laurent Destailleur
2020-01-15 11:56:46 +01:00
parent 14d59f43af 0442105bd4
commit c8ff847480
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/lib/files.lib.php
View File

@@ -2082,9 +2082,10 @@ function dol_uncompress($inputfile, $outputdir)
* @param string $outputfile Target file name (output directory must exists and be writable) * @param string $outputfile Target file name (output directory must exists and be writable)
* @param string $mode 'zip' * @param string $mode 'zip'
* @param string $excludefiles A regex pattern. For example: '/\.log$|\/temp\//' * @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 * @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; $foundhandler=0;
@@ -2145,7 +2146,8 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
{ {
// Get real and relative path for current file // Get real and relative path for current file
$filePath = $file->getRealPath(); $filePath = $file->getRealPath();
$relativePath = substr($filePath, strlen($inputdir) + 1); $relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen($inputdir) + 1);
if (empty($excludefiles) || ! preg_match($excludefiles, $filePath)) if (empty($excludefiles) || ! preg_match($excludefiles, $filePath))
{ {
// Add current file to archive // Add current file to archive

2
htdocs/modulebuilder/index.php
View File

@@ -1307,7 +1307,7 @@ if ($dirins && $action == 'generatepackage')
if ($dirofmodule) if ($dirofmodule)
{ {
if (!dol_is_dir($dirofmodule)) dol_mkdir($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 else
{ {