#73 - deleting upgrade folder after upgrade is completed

inc/classes/BxDolCronUpgradeCheck.php

@@ -17,7 +17,7 @@ class BxDolCronUpgradeCheck extends BxDolCron
             return;
 
         $o = bx_instance('BxDolUpgrader');
-        if (!$o->prepare()) {            
+        if (!$o->prepare()) {
             sendMailTemplateSystem('t_UpgradeFailed', array (
                 'error_msg' => $o->getError(),
             ));

inc/classes/BxDolUpgrader.php

@@ -45,7 +45,7 @@ class BxDolUpgrader extends BxDol
             $aFailedFiles = $this->checkFilesChecksums ($fChangedFilesPercent);
             $bAutoupdateForceModifiedFiles = ('on' == getParam('sys_autoupdate_force_modified_files'));
             if (!empty($aFailedFiles) && !$bAutoupdateForceModifiedFiles) {
-                $this->setError(_t('_sys_upgrade_files_checksum_failed', implode(',', $aFailedFiles)));
+                $this->setError(_t('_sys_upgrade_files_checksum_failed', implode(', ', $aFailedFiles)));
                 break;
             }
             elseif ($fChangedFilesPercent > BX_FORCE_AUTOUPDATE_MAX_CHANGED_FILES_PERCENT && $bAutoupdateForceModifiedFiles) {

periodic/cron.php

@@ -124,7 +124,7 @@ $oDb = BxDolDb::getInstance();
 
 $aJobsTransient = $oDb->getAllWithKey("SELECT * FROM `sys_cron_jobs` WHERE `time` = 'transient'", 'name');
 if (!empty($aJobsTransient)) {
-    // $oDb->query("DELETE FROM `sys_cron_jobs` WHERE `time` = 'transient'"); // TODO: temporarily commented out
+    $oDb->query("DELETE FROM `sys_cron_jobs` WHERE `time` = 'transient'");
 
     foreach ($aJobsTransient as $aRow)
         runJob($aRow);

upgrade/BxDolUpgradeCron.php

@@ -36,11 +36,17 @@ class BxDolUpgradeCron extends BxDolCron
                     'conclusion' => $oController->getConclusion() ? _t('_sys_upgrade_conclusion', $oController->getConclusion()) : '',
                 ));
 
-                // if next upgrade (in case of bulk upgrade) is available then schedule to run it ASAP, upon next cron run
-                if ($oController->getAvailableUpgrade()) { 
-                    bx_import('BxDolUpgrader');
+                // if next upgrade is available (in case of bulk upgrade) then schedule to run it upon next cron run
+                $sUpgradeDir = pathinfo(__FILE__, PATHINFO_DIRNAME);
+                if ($oController->getAvailableUpgrade()) {
+
                     $oUpgrader = bx_instance('BxDolUpgrader');
-                    $oUpgrader->setTransientUpgradeCronJob(pathinfo(__FILE__, PATHINFO_DIRNAME));
+                    $oUpgrader->setTransientUpgradeCronJob($sUpgradeDir);
+
+                } elseif (0 === strpos($sUpgradeDir, BX_DIRECTORY_PATH_TMP)) {
+
+                    @unlink($sUpgradeDir);
+
                 }
             }