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

Corrige comptage dans suppression recursive

Browse Source
This commit is contained in:
Laurent Destailleur
2006-11-11 15:52:17 +00:00
parent bf95f8142a
commit ac6f085ced
3 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/tools/index.php
View File

@@ -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>';

2
htdocs/admin/tools/purge.php
View File

@@ -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']);
} }
} }

8
htdocs/lib/functions.inc.php
View File

@@ -1622,14 +1622,12 @@ function dol_delete_dir($dir)
} }
/** /**
\brief Effacement d'un r<>pertoire et son arborescence \brief Effacement d'un r<>pertoire $dir et de son arborescence
\param file R<>pertoire a effacer \param file R<>pertoire a effacer
\return int Nombre de fichier+rep<65>rtoires supprim<69>s \return int Nombre de fichier+rep<65>rtoires supprim<69>s
*/ */
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)
{ {
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
{ {