From: <min...@us...> - 2006-11-29 18:38:43
|
Revision: 15319 http://svn.sourceforge.net/gallery/?rev=15319&view=rev Author: mindless Date: 2006-11-29 10:32:00 -0800 (Wed, 29 Nov 2006) Log Message: ----------- make sure processRequest always returns a value (explicitly return false instead of no return); some cleanup in error handling. Modified Paths: -------------- trunk/gallery2/install/steps/InstallCoreModuleStep.class trunk/gallery2/install/steps/InstallOtherModulesStep.class trunk/gallery2/install/steps/SystemChecksStep.class trunk/gallery2/upgrade/steps/SystemChecksStep.class trunk/gallery2/upgrade/steps/UpgradeCoreModuleStep.class trunk/gallery2/upgrade/steps/UpgradeOtherModulesStep.class Modified: trunk/gallery2/install/steps/InstallCoreModuleStep.class =================================================================== --- trunk/gallery2/install/steps/InstallCoreModuleStep.class 2006-11-29 18:11:06 UTC (rev 15318) +++ trunk/gallery2/install/steps/InstallCoreModuleStep.class 2006-11-29 18:32:00 UTC (rev 15319) @@ -202,6 +202,7 @@ } $template->hideStatusBlock(); $template->renderBodyAndFooter($templateData); + return false; } /* Adds a header to the debug log */ Modified: trunk/gallery2/install/steps/InstallOtherModulesStep.class =================================================================== --- trunk/gallery2/install/steps/InstallOtherModulesStep.class 2006-11-29 18:11:06 UTC (rev 15318) +++ trunk/gallery2/install/steps/InstallOtherModulesStep.class 2006-11-29 18:32:00 UTC (rev 15319) @@ -69,11 +69,8 @@ $this->resetL10Domain(); $gallery->guaranteeTimeLimit(120); - $ret = $template->renderStatusMessage(_('Installing modules'), + $template->renderStatusMessage(_('Installing modules'), $module->getName(), $currentModule / $totalModules); - if ($ret) { - return $ret; - } $ret = $module->installOrUpgrade(); if ($ret) { @@ -144,6 +141,7 @@ } } $template->renderBodyAndFooter($templateData); + return false; } function loadTemplateData(&$templateData) { Modified: trunk/gallery2/install/steps/SystemChecksStep.class =================================================================== --- trunk/gallery2/install/steps/SystemChecksStep.class 2006-11-29 18:11:06 UTC (rev 15318) +++ trunk/gallery2/install/steps/SystemChecksStep.class 2006-11-29 18:32:00 UTC (rev 15319) @@ -434,6 +434,7 @@ $this->setComplete($failCount == 0); $this->setInError($failCount > 0); $template->renderBodyAndFooter($templateData); + return false; } function CheckFileDirective() { Modified: trunk/gallery2/upgrade/steps/SystemChecksStep.class =================================================================== --- trunk/gallery2/upgrade/steps/SystemChecksStep.class 2006-11-29 18:11:06 UTC (rev 15318) +++ trunk/gallery2/upgrade/steps/SystemChecksStep.class 2006-11-29 18:32:00 UTC (rev 15319) @@ -69,11 +69,7 @@ krsort($removeList); $isWindows = !strncasecmp(PHP_OS, 'win', 3); - if ($isWindows) { - $fileName = 'cleanup.bat'; - } else { - $fileName = 'cleanup.sh'; - } + $fileName = $isWindows ? 'cleanup.bat' : 'cleanup.sh'; header("Content-Type: application/data"); header('Content-Disposition: attachment; filename=' . $fileName); include(dirname(__FILE__) . '/../templates/ManifestCleanupScript.html'); Modified: trunk/gallery2/upgrade/steps/UpgradeCoreModuleStep.class =================================================================== --- trunk/gallery2/upgrade/steps/UpgradeCoreModuleStep.class 2006-11-29 18:11:06 UTC (rev 15318) +++ trunk/gallery2/upgrade/steps/UpgradeCoreModuleStep.class 2006-11-29 18:32:00 UTC (rev 15319) @@ -41,7 +41,7 @@ if (empty($translator)) { $ret = $gallery->initTranslator(true /* dontUseDatabase */ ); if ($ret) { - return $ret; + return true; } } @@ -129,6 +129,7 @@ } $template->renderBodyAndFooter($templateData); + return false; } } ?> Modified: trunk/gallery2/upgrade/steps/UpgradeOtherModulesStep.class =================================================================== --- trunk/gallery2/upgrade/steps/UpgradeOtherModulesStep.class 2006-11-29 18:11:06 UTC (rev 15318) +++ trunk/gallery2/upgrade/steps/UpgradeOtherModulesStep.class 2006-11-29 18:32:00 UTC (rev 15319) @@ -67,11 +67,8 @@ $this->resetL10Domain(); $gallery->guaranteeTimeLimit(120); - $ret = $template->renderStatusMessage(_('Upgrading modules'), + $template->renderStatusMessage(_('Upgrading modules'), $module->getName(), $currentModule / $totalModules); - if ($ret) { - return $ret; - } $ret = $module->installOrUpgrade(); $this->resetL10Domain(); @@ -111,11 +108,8 @@ $theme->setDescription($theme->translate($theme->getDescription())); $this->resetL10Domain(); - $ret = $template->renderStatusMessage(_('Upgrading themes'), + $template->renderStatusMessage(_('Upgrading themes'), $theme->getName(), $currentTheme / $totalThemes); - if ($ret) { - return $ret; - } $ret = $theme->installOrUpgrade(); $this->resetL10Domain(); @@ -154,6 +148,7 @@ } $template->hideStatusBlock(); $template->renderBodyAndFooter($templateData); + return false; } function loadTemplateData(&$templateData) { @@ -171,7 +166,7 @@ if (empty($translator)) { $ret = $gallery->initTranslator(); if ($ret) { - return $ret; + return; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |