Skip to content
Snippets Groups Projects
Commit ac6f085c authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Corrige comptage dans suppression recursive

parent bf95f814
No related branches found
No related tags found
No related merge requests found
...@@ -47,7 +47,9 @@ $form = new Form($db); ...@@ -47,7 +47,9 @@ $form = new Form($db);
print_fiche_titre($langs->trans("SystemToolsArea"),'','setup'); print_fiche_titre($langs->trans("SystemToolsArea"),'','setup');
print "<br>"; //print "<br>";
print info_admin($langs->trans("SystemAreaForAdminOnly")).'<br>';
if ($message) print $message.'<br>'; if ($message) print $message.'<br>';
......
...@@ -68,7 +68,7 @@ if ($_POST["action"]=='purge') ...@@ -68,7 +68,7 @@ if ($_POST["action"]=='purge')
foreach($filesarray as $key => $value) foreach($filesarray as $key => $value)
{ {
//print "x ".$filesarray[$key]['fullname']."<br>\n"; //print "x ".$filesarray[$key]['fullname']."<br>\n";
$count=dol_delete_dir_recursive($filesarray[$key]['fullname']); $count+=dol_delete_dir_recursive($filesarray[$key]['fullname']);
} }
} }
......
...@@ -1622,14 +1622,12 @@ function dol_delete_dir($dir) ...@@ -1622,14 +1622,12 @@ function dol_delete_dir($dir)
} }
/** /**
\brief Effacement d'un rpertoire et son arborescence \brief Effacement d'un rpertoire $dir et de son arborescence
\param file Rpertoire a effacer \param file Rpertoire a effacer
\return int Nombre de fichier+reprtoires supprims \return int Nombre de fichier+reprtoires supprims
*/ */
function dol_delete_dir_recursive($dir) function dol_delete_dir_recursive($dir,$count=0)
{ {
$count=0;
if ($handle = opendir("$dir")) if ($handle = opendir("$dir"))
{ {
while (false !== ($item = readdir($handle))) while (false !== ($item = readdir($handle)))
...@@ -1638,7 +1636,7 @@ function dol_delete_dir_recursive($dir) ...@@ -1638,7 +1636,7 @@ function dol_delete_dir_recursive($dir)
{ {
if (is_dir("$dir/$item")) if (is_dir("$dir/$item"))
{ {
dol_delete_dir_recursive("$dir/$item"); $count=dol_delete_dir_recursive("$dir/$item",$count);
} }
else else
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment