[TASK] Rename AccessNotAllowedAction to FirstInstallAction 26/41626/2
authorOliver Eglseder <oliver.eglseder@in2code.de>
Fri, 17 Jul 2015 21:50:30 +0000 (23:50 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Fri, 17 Jul 2015 22:38:41 +0000 (00:38 +0200)
AccessNotAllowed does IMHO not reflect the
intended message of the FIRST_INSTALL screen.

Resolves: #68314
Releases: master
Change-Id: If178abd2290d037fea7e640369fb2c5dddd45414
Reviewed-on: http://review.typo3.org/41626
Reviewed-by: Ralf Merz <info@merzilla.de>
Reviewed-by: Markus Sommer <markussom@posteo.de>
Tested-by: Markus Sommer <markussom@posteo.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/install/Classes/Controller/AbstractController.php
typo3/sysext/install/Classes/Controller/Action/Common/AccessNotAllowedAction.php [deleted file]
typo3/sysext/install/Classes/Controller/Action/Common/FirstInstallAction.php [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/Action/Common/AccessNotAllowed.html [deleted file]
typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html [new file with mode: 0644]

index 9f573c7..ab0bacf 100644 (file)
@@ -63,8 +63,8 @@ class AbstractController {
                if (!$this->isInstallToolAvailable()) {
                        if (!EnableFileService::isFirstInstallAllowed() && !is_dir(PATH_typo3conf)) {
                                /** @var \TYPO3\CMS\Install\Controller\Action\ActionInterface $action */
-                               $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Common\AccessNotAllowedAction::class);
-                               $action->setAction('accessNotAllowed');
+                               $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Common\FirstInstallAction::class);
+                               $action->setAction('firstInstall');
                        } else {
                                /** @var \TYPO3\CMS\Install\Controller\Action\ActionInterface $action */
                                $action = $this->objectManager->get(\TYPO3\CMS\Install\Controller\Action\Common\InstallToolDisabledAction::class);
diff --git a/typo3/sysext/install/Classes/Controller/Action/Common/AccessNotAllowedAction.php b/typo3/sysext/install/Classes/Controller/Action/Common/AccessNotAllowedAction.php
deleted file mode 100644 (file)
index 804532b..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-namespace TYPO3\CMS\Install\Controller\Action\Common;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Install\Controller\Action;
-
-/**
- * Welcome page
- */
-class AccessNotAllowedAction extends Action\AbstractAction {
-
-       /**
-        * Handle this action
-        *
-        * @return string content
-        */
-       public function executeAction() {
-               return $this->view->render();
-       }
-
-}
diff --git a/typo3/sysext/install/Classes/Controller/Action/Common/FirstInstallAction.php b/typo3/sysext/install/Classes/Controller/Action/Common/FirstInstallAction.php
new file mode 100644 (file)
index 0000000..746b028
--- /dev/null
@@ -0,0 +1,33 @@
+<?php
+namespace TYPO3\CMS\Install\Controller\Action\Common;
+
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+use TYPO3\CMS\Install\Controller\Action;
+
+/**
+ * Welcome page
+ */
+class FirstInstallAction extends Action\AbstractAction {
+
+       /**
+        * Handle this action
+        *
+        * @return string content
+        */
+       public function executeAction() {
+               return $this->view->render();
+       }
+
+}
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Common/AccessNotAllowed.html b/typo3/sysext/install/Resources/Private/Templates/Action/Common/AccessNotAllowed.html
deleted file mode 100644 (file)
index 69ce3a7..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-       <title>The Access to the Install Tool blocked</title>
-       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Common/EarlyExit.css?{time}" />
-</head>
-<body>
-<div id="container">
-       <h1>TYPO3</h1>
-       <div class="typo3-message message-warning">
-               <h2>Thank you for installing TYPO3</h2>
-               <p>
-                       To proceed with the installation, create the file <strong>FIRST_INSTALL</strong>
-                       in your root directory.
-                       The filename is case-sensitive but the file itself can be empty.
-               </p>
-
-               <p>
-                       <strong>Note:</strong>
-                       The file will be deleted once you proceed with the installation.
-               </p>
-       </div>
-</div>
-</body>
-</html>
diff --git a/typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html b/typo3/sysext/install/Resources/Private/Templates/Action/Common/FirstInstall.html
new file mode 100644 (file)
index 0000000..69ce3a7
--- /dev/null
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+       <title>The Access to the Install Tool blocked</title>
+       <link rel="stylesheet" type="text/css" href="../Resources/Public/Css/Action/Common/EarlyExit.css?{time}" />
+</head>
+<body>
+<div id="container">
+       <h1>TYPO3</h1>
+       <div class="typo3-message message-warning">
+               <h2>Thank you for installing TYPO3</h2>
+               <p>
+                       To proceed with the installation, create the file <strong>FIRST_INSTALL</strong>
+                       in your root directory.
+                       The filename is case-sensitive but the file itself can be empty.
+               </p>
+
+               <p>
+                       <strong>Note:</strong>
+                       The file will be deleted once you proceed with the installation.
+               </p>
+       </div>
+</div>
+</body>
+</html>