X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/0e33de2bae181408595960063dd95c3fb55774bf..4f06c86f2353b07e6d6b393d65cb681f86923054:/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php

diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index c3c647bd66b1..d2b058478c82 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -107,23 +107,43 @@ class DownloadController extends \TYPO3\CMS\Extensionmanager\Controller\Abstract
 	}
 
 	/**
-	 * Install an extension from TER
+	 * Install an extension from TER action
 	 *
 	 * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
 	 * @param string $downloadPath
-	 * @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
 	 */
 	public function installFromTerAction(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension, $downloadPath) {
-		$result = FALSE;
-		$errorMessage = '';
-		try {
-			$this->downloadUtility->setDownloadPath($downloadPath);
-			$this->prepareExtensionForImport($extension);
-			$result = $this->managementService->resolveDependenciesAndInstall($extension);
-		} catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException $e) {
-			$errorMessage = $e->getMessage();
+		list($result, $errorMessage) = $this->installFromTer($extension, $downloadPath);
+		$this->view
+			->assign('result', $result)
+			->assign('extension', $extension)
+			->assign('errorMessage', $errorMessage);
+	}
+
+	/**
+	 * Action for installing a distribution -
+	 * redirects directly to configuration after installing
+	 *
+	 * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
+	 * @return void
+	 */
+	public function installDistributionAction(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension) {
+		list($result, $errorMessage) = $this->installFromTer($extension);
+		if ($errorMessage) {
+			// @TODO: write Template
+			$this->view
+				->assign('result', $result)
+				->assign('errorMessage', $errorMessage);
+		} else {
+			$this->redirect(
+				'showConfigurationForm',
+				'Configuration',
+				NULL,
+				array(
+					'extension' => $this->installUtility->enrichExtensionWithDetails($extension->getExtensionKey())
+				)
+			);
 		}
-		$this->view->assign('result', $result)->assign('extension', $extension)->assign('errorMessage', $errorMessage);
 	}
 
 	/**
@@ -176,6 +196,27 @@ class DownloadController extends \TYPO3\CMS\Extensionmanager\Controller\Abstract
 		}
 		$this->view->assign('updateComments', $updateComments)->assign('extensionKey', $extensionKey);
 	}
+
+	/**
+	 * Install an action from TER
+	 * Downloads the extension, resolves dependencies and installs it
+	 *
+	 * @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension
+	 * @param string $downloadPath
+	 * @return array
+	 */
+	protected function installFromTer(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extension, $downloadPath = 'Local') {
+		$result = FALSE;
+		$errorMessage = '';
+		try {
+			$this->downloadUtility->setDownloadPath($downloadPath);
+			$this->prepareExtensionForImport($extension);
+			$result = $this->managementService->resolveDependenciesAndInstall($extension);
+		} catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException $e) {
+			$errorMessage = $e->getMessage();
+		}
+		return array($result, $errorMessage);
+	}
 }