composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 19:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

#663: Fix for emptying a directory which contains broken symbolic links

Browse Source 
SVN:trunk[2707]
This commit is contained in:
Denis Flaven
2013-04-29 08:34:19 +00:00
parent d433a45200
commit 6df6af0df0
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
setup/setuputils.class.inc.php
View File

@@ -471,16 +471,30 @@ class SetupUtils
throw new Exception("Attempting to delete directory: '$dir'"); throw new Exception("Attempting to delete directory: '$dir'");
} }
foreach(glob($dir . '/*') as $file) $aFiles = scandir($dir); // Warning glob('.*') does not seem to return the broken symbolic links, thus leaving a non-empty directory
if ($aFiles !== false)
{ {
if(is_dir($file)) foreach($aFiles as $file)
{ {
self::tidydir($file); if (($file != '.') && ($file != '..'))
rmdir($file); {
} if(is_dir($dir.'/'.$file))
else {
{ self::tidydir($dir.'/'.$file);
unlink($file); rmdir($dir.'/'.$file);
}
else
{
if (!unlink($dir.'/'.$file))
{
SetupPage::log("Warning - FAILED to remove file '$dir/$file'");
}
else if (file_exists($dir.'/'.$file))
{
SetupPage::log("Warning - FAILED to remove file '$dir/.$file'");
}
}
}
} }
} }
} }