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

New: Function dol_delete_dir_recursive accept new param $onlysub

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-11 15:20:07 +02:00
parent 4ce2495a33
commit 526066803c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -802,14 +802,15 @@ function dol_delete_dir($dir,$nophperrors=0)
} }
/** /**
* Remove a directory $dir and its subdirectories * Remove a directory $dir and its subdirectories (or only files and subdirectories)
* *
* @param string $dir Dir to delete * @param string $dir Dir to delete
* @param int $count Counter to count nb of deleted elements * @param int $count Counter to count nb of deleted elements
* @param int $nophperrors Disable all PHP output errors * @param int $nophperrors Disable all PHP output errors
* @param int $onlysub Delete only files and subdir, not main directory
* @return int Number of files and directory removed * @return int Number of files and directory removed
*/ */
function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0) function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0,$onlysub=0)
{ {
dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG); dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir,LOG_DEBUG);
if (dol_is_dir($dir)) if (dol_is_dir($dir))
@ -836,9 +837,13 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0)
} }
} }
closedir($handle); closedir($handle);
dol_delete_dir($dir,$nophperrors);
$count++; if (empty($onlysub))
//echo "removing $dir<br>\n"; {
dol_delete_dir($dir,$nophperrors);
$count++;
//echo "removing $dir<br>\n";
}
} }
} }