From 64b0b1ebc88b410b387794ea5d994d74f99b92dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= <loeffler@spooner-web.de>
Date: Thu, 17 Aug 2017 22:42:58 +0200
Subject: [PATCH] Fixes review form

---
 html/typo3conf/RealurlConfiguration.php       |  6 ++-
 .../Classes/Controller/ReviewController.php   | 41 +++++--------------
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/html/typo3conf/RealurlConfiguration.php b/html/typo3conf/RealurlConfiguration.php
index 9b519a8d..bfa3b89e 100644
--- a/html/typo3conf/RealurlConfiguration.php
+++ b/html/typo3conf/RealurlConfiguration.php
@@ -35,7 +35,8 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['_DEFAULT'] = [
             [
                 'GETvar' => 'tx_terfe2_pi1[controller]',
                 'valueMap' => [
-                    'Extension' => ''
+                    'Extension' => '',
+                    'Review' => 'security-review'
                 ],
                 'noMatch' => 'bypass'
             ],
@@ -43,7 +44,8 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['_DEFAULT'] = [
                 'GETvar' => 'tx_terfe2_pi1[action]',
                 'valueMap' => [
                     'detail' => '',
-                    'download' => 'download'
+                    'download' => 'download',
+                    'update' => 'update'
                 ],
                 'noMatch' => 'bypass'
             ],
diff --git a/html/typo3conf/ext/ter_fe2/Classes/Controller/ReviewController.php b/html/typo3conf/ext/ter_fe2/Classes/Controller/ReviewController.php
index 512c4e62..c195f04a 100644
--- a/html/typo3conf/ext/ter_fe2/Classes/Controller/ReviewController.php
+++ b/html/typo3conf/ext/ter_fe2/Classes/Controller/ReviewController.php
@@ -31,41 +31,22 @@ namespace T3o\TerFe2\Controller;
 class ReviewController extends \T3o\TerFe2\Controller\AbstractTerBasedController
 {
 
-    /**
-     * @var \TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager
-     */
-    protected $persistenceManager;
-
-
-    /**
-     * Initializes the controller
-     *
-     * @return void
-     */
-    protected function initializeController()
-    {
-        $this->persistenceManager = $this->objectManager->get(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class);
-    }
-
-
     /**
      * Set unsecure flag of all given versions
      *
      * @param \T3o\TerFe2\Domain\Model\Extension $extension The extension to update
-     * @param mixed $insecureVersions Version UIDs or empty string of no version was selected
+     * @param array $insecureVersions Version UIDs or empty string of no version was selected
      * @return void
      */
-    public function updateAction(\T3o\TerFe2\Domain\Model\Extension $extension, $insecureVersions)
+    public function updateAction(\T3o\TerFe2\Domain\Model\Extension $extension, array $insecureVersions)
     {
-        $insecureVersions = (is_array($insecureVersions) ? $insecureVersions : array());
-        $extensionKey = $extension->getExtKey();
+        $actionParameters = ['extension' => $extension];
         $versions = $extension->getVersions();
-        $persist = FALSE;
+        $versionChanged = false;
+        $versionRepository = $this->objectManager->get(\T3o\TerFe2\Domain\Repository\VersionRepository::class);
 
         foreach ($versions as $version) {
-            $versionString = $version->getVersionString();
-            $actionParameters = array('extension' => $extension);
-
+            /** @var \T3o\TerFe2\Domain\Model\Version $version */
             $reviewState = 0;
             if (in_array($version->getUid(), $insecureVersions)) {
                 $reviewState = -1;
@@ -76,17 +57,17 @@ class ReviewController extends \T3o\TerFe2\Controller\AbstractTerBasedController
             }
 
             $error = '';
-            if ($this->terConnection->setReviewState($extensionKey, $versionString, $reviewState, $error)) {
+            if ($this->terConnection->setReviewState($extension->getExtKey(), $version->getVersionString(), $reviewState, $error)) {
                 $version->setReviewState($reviewState);
-                $persist = TRUE;
+                $versionChanged = true;
+                $versionRepository->update($version);
             } else {
-                $message = $this->translate('msg.reviewstate_not_enabled', array($versionString, $error));
+                $message = $this->translate('msg.reviewstate_not_enabled', [$version->getVersionString(), $error]);
                 $this->redirectWithMessage($message, 'show', '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR, 'Extension', NULL, $actionParameters);
             }
         }
 
-        if ($persist) {
-            $this->persistenceManager->persistAll();
+        if ($versionChanged) {
             $this->redirectWithMessage($this->translate('msg.reviewstate_enabled'), 'show', '', \TYPO3\CMS\Core\Messaging\FlashMessage::OK, 'Extension', NULL, $actionParameters);
         }
 
-- 
GitLab