#73 - delete temporary files after upgrade is completed

inc/classes/BxDolCronPruning.php

@@ -86,19 +86,31 @@ class BxDolCronPruning extends BxDolCron
         $iNumDel = 0;
 
         foreach ($aDirsToClean as $sDir) {
+
             if (!($h = opendir($sDir)))
                 continue;
 
             while ($sFile = readdir($h)) {
-                $diff = time() - filectime($sDir . $sFile);
-                if ($diff > $iTmpFileLife && '.' != $sFile && '..' != $sFile && '.htaccess' !== $sFile) {
-                    @unlink ($sDir . $sFile);
-                    ++$iNumDel;
-                }
+
+                if ('.' == $sFile || '..' == $sFile || '.' == $sFile[0])
+                    continue;
+
                 ++$iNumTmp;
+
+                $iDiff = time() - filemtime($sDir . $sFile);
+
+                if ($iDiff < $iTmpFileLife)
+                    continue;
+
+                if (is_file($sDir . $sFile))
+                    @unlink ($sDir . $sFile);
+                else
+                    @bx_rrmdir($sDir . $sFile);
+
+                ++$iNumDel;
             }
-            closedir($h);
 
+            closedir($h);
         }
 
         echo _t('_sys_pruning_files', $iNumTmp, $iNumDel);

upgrade/BxDolUpgradeCron.php

@@ -45,7 +45,7 @@ class BxDolUpgradeCron extends BxDolCron
 
                 } elseif (0 === strpos($sUpgradeDir, BX_DIRECTORY_PATH_TMP)) {
 
-                    @unlink($sUpgradeDir);
+                    @bx_rrmdir($sUpgradeDir);
 
                 }
             }