Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

push phpunit to of the function

Browse Source
This commit is contained in:
Lucas Marcouiller
2022-05-22 15:44:57 +02:00
parent dbf66988a6
commit f43f2ab670
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -981,13 +981,13 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase
global $user, $db, $conf; global $user, $db, $conf;
$result = false; $result = false;
dol_syslog("files.lib.php::dol_dir_move srcdir=".$srcdir." destdir=".$destdir." overwritifexists=".$overwriteifexists); dol_syslog("files.lib.php::dol_move_dir srcdir=".$srcdir." destdir=".$destdir." overwritifexists=".$overwriteifexists." indexdatabase=".$indexdatabase." renamedircontent=".$renamedircontent);
$srcexists = dol_is_dir($srcdir); $srcexists = dol_is_dir($srcdir);
$srcbasename = basename($srcdir); $srcbasename = basename($srcdir);
$destexists = dol_is_dir($destdir); $destexists = dol_is_dir($destdir);
if (!$srcexists) { if (!$srcexists) {
dol_syslog("files.lib.php::dol_dir_move srcdir does not exists. we ignore the move request."); dol_syslog("files.lib.php::dol_move_dir srcdir does not exists. we ignore the move request.");
return false; return false;
} }
@@ -1004,14 +1004,15 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase
if (!empty($files) && is_array($files)) { if (!empty($files) && is_array($files)) {
foreach ($files as $key => $file) { foreach ($files as $key => $file) {
if (!file_exists($file["fullname"])) continue; if (!file_exists($file["fullname"])) continue;
$oldpath = $file["fullname"]; $filepath = $file["path"];
$oldname = $file["name"];
$newpath = str_replace($srcbasename, $destbasename, $oldpath); $newname = str_replace($srcbasename, $destbasename, $oldname);
if (!empty($newpath)) { if (!empty($newname) && $newname !== $oldname) {
if (dol_is_dir($oldpath)) { if ($file["type"] == "dir") {
$res = dol_move_dir($oldpath, $newpath, $overwriteifexists, $indexdatabase, $renamedircontent); $res = dol_move_dir($filepath.'/'.$oldname, $filepath.'/'.$newname, $overwriteifexists, $indexdatabase, $renamedircontent);
} else { } else {
$res = dol_move($oldpath, $newpath); $res = dol_move($filepath.'/'.$oldname, $filepath.'/'.$newname);
} }
if (!$res) { if (!$res) {
return $result; return $result;
@@ -1023,7 +1024,6 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase
} }
} }
} }
return $result; return $result;
} }