Release 5.0.0

Classes/Controller/RouteController.php

@@ -26,22 +26,19 @@ namespace SGalinski\SgRoutes\Controller;
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
 
-use SGalinski\SgRoutes\Service\DemoModeService;
 use InvalidArgumentException;
 use SGalinski\SgRoutes\Domain\Model\Category;
-use SGalinski\SgRoutes\Domain\Model\PageNotFoundHandling;
 use SGalinski\SgRoutes\Domain\Model\Route;
 use SGalinski\SgRoutes\Domain\Repository\CategoryRepository;
 use SGalinski\SgRoutes\Domain\Repository\LogRepository;
 use SGalinski\SgRoutes\Domain\Repository\PageNotFoundHandlingRepository;
 use SGalinski\SgRoutes\Domain\Repository\RoutehitRepository;
 use SGalinski\SgRoutes\Domain\Repository\RouteRepository;
+use SGalinski\SgRoutes\Service\DemoModeService;
 use SGalinski\SgRoutes\Service\LicenceCheckService;
 use SGalinski\SgRoutes\Service\LicensingService;
 use SGalinski\SgRoutes\Service\RoutingService;
 use TYPO3\CMS\Backend\Clipboard\Clipboard;
-use TYPO3\CMS\Backend\Routing\Exception\RouteNotFoundException;
-use TYPO3\CMS\Backend\Routing\UriBuilder;
 use TYPO3\CMS\Backend\Template\Components\ButtonBar;
 use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
 use TYPO3\CMS\Backend\Utility\BackendUtility;
@@ -56,7 +53,6 @@ use TYPO3\CMS\Core\Messaging\AbstractMessage;
 use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
 use TYPO3\CMS\Extbase\Mvc\View\ViewInterface;
@@ -601,7 +597,6 @@ class RouteController extends ActionController {
 	 * Initializes the demo mode
 	 */
 	protected function initDemoMode() {
-		$typo3Version = VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version);
 		$keyState = DemoModeService::checkKey();
 		$hasValidLicense = LicenceCheckService::hasValidLicense();
 		$isInDemoMode = DemoModeService::isInDemoMode();
@@ -616,37 +611,25 @@ class RouteController extends ActionController {
 				LocalizationUtility::translate('backend.licenseKey.isInDemoMode.header', 'sg_routes'),
 				AbstractMessage::INFO
 			);
-		} elseif ($keyState === DemoModeService::STATE_LICENSE_INVALID) {
-			if ($typo3Version < 9000000) {
-				$description = LocalizationUtility::translate(
-					'backend.licenseKey.invalid.description', 'sg_routes'
-				);
-			} else {
-				$description = LocalizationUtility::translate(
-					'backend.licenseKey.invalid.descriptionTYPO3-9', 'sg_routes'
-				);
-			}
+		} elseif ($keyState === DemoModeService::STATE_LICENSE_NOT_SET) {
+			$description = LocalizationUtility::translate(
+				'backend.licenseKey.notSet.descriptionTYPO3-9', 'sg_routes'
+			);
 
 			$this->addFlashMessage(
 				$description,
-				LocalizationUtility::translate('backend.licenseKey.invalid.header', 'sg_routes'),
-				AbstractMessage::ERROR
+				LocalizationUtility::translate('backend.licenseKey.notSet.header', 'sg_routes'),
+				AbstractMessage::WARNING
+			);
+		} elseif (!$hasValidLicense) {
+			$description = LocalizationUtility::translate(
+				'backend.licenseKey.invalid.descriptionTYPO3-9', 'sg_routes'
 			);
-		} elseif ($keyState === DemoModeService::STATE_LICENSE_NOT_SET) {
-			if ($typo3Version < 9000000) {
-				$description = LocalizationUtility::translate(
-					'backend.licenseKey.notSet.description', 'sg_routes'
-				);
-			} else {
-				$description = LocalizationUtility::translate(
-					'backend.licenseKey.notSet.descriptionTYPO3-9', 'sg_routes'
-				);
-			}
 
 			$this->addFlashMessage(
 				$description,
-				LocalizationUtility::translate('backend.licenseKey.notSet.header', 'sg_routes'),
-				AbstractMessage::WARNING
+				LocalizationUtility::translate('backend.licenseKey.invalid.header', 'sg_routes'),
+				AbstractMessage::ERROR
 			);
 		}
 
@@ -657,18 +640,19 @@ class RouteController extends ActionController {
 	/**
 	 * Add a flash message
 	 *
-	  * @param string $messageBody
-	  * @param string $messageTitle
-	  * @param int $severity
-	  * @param bool $storeInSession
-	  */
-	 public function addFlashMessage($messageBody, $messageTitle = '', $severity = AbstractMessage::OK, $storeInSession = true)
-	 {
-	     if (null === $this->controllerContext) {
-	         $this->controllerContext = $this->buildControllerContext();
-	     }
-	     parent::addFlashMessage($messageBody, $messageTitle, $severity, $storeInSession);
-	 }
+	 * @param string $messageBody
+	 * @param string $messageTitle
+	 * @param int $severity
+	 * @param bool $storeInSession
+	 */
+	public function addFlashMessage(
+		$messageBody, $messageTitle = '', $severity = AbstractMessage::OK, $storeInSession = TRUE
+	) {
+		if (NULL === $this->controllerContext) {
+			$this->controllerContext = $this->buildControllerContext();
+		}
+		parent::addFlashMessage($messageBody, $messageTitle, $severity, $storeInSession);
+	}
 
 	/**
 	 * Activates the demo mode for the given instance.