From 8c225c61eab1ddf1c7aab3e735641a8f148b0314 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sat, 29 Sep 2018 12:25:22 +0200
Subject: [PATCH] [TASK] Create .htaccess or web.config file upon installation
With the new routing, TYPO3 relies on a default redirect to index.php
for FE requests. The patch checks during installation if apache or IIS
are used and creates the default .htaccess / web.config files.
Change-Id: I9406a7e4d91050d3f5bf96dd63e4bf63e8f71250
Resolves: #86173
Releases: master
Reviewed-on: https://review.typo3.org/58451
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../FolderStructure/DefaultFactory.php | 23 +++++++++++++++++--
.../root-htaccess | 0
.../root-web-config | 0
3 files changed, 21 insertions(+), 2 deletions(-)
rename _.htaccess => typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess (100%)
rename _web.config => typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-web-config (100%)
diff --git a/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php b/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php
index fe04ae344f25..0e0e4d891f07 100644
--- a/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php
+++ b/typo3/sysext/install/Classes/FolderStructure/DefaultFactory.php
@@ -39,12 +39,12 @@ class DefaultFactory
*
* @return array
*/
- protected function getDefaultStructureDefinition()
+ protected function getDefaultStructureDefinition(): array
{
$filePermission = $GLOBALS['TYPO3_CONF_VARS']['SYS']['fileCreateMask'];
$directoryPermission = $GLOBALS['TYPO3_CONF_VARS']['SYS']['folderCreateMask'];
- return [
+ $structure = [
// Note that root node has no trailing slash like all others
'name' => Environment::getPublicPath(),
'targetPermission' => $directoryPermission,
@@ -212,5 +212,24 @@ class DefaultFactory
],
],
];
+
+ // Have a default .htaccess if running apache web server or a default web.config if running IIS
+ if (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') === 0) {
+ $structure['children'][] = [
+ 'name' => '.htaccess',
+ 'type' => FileNode::class,
+ 'targetPermission' => $filePermission,
+ 'targetContentFile' => Environment::getPublicPath() . '/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess',
+ ];
+ } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === 0) {
+ $structure['children'][] = [
+ 'name' => 'web.config',
+ 'type' => FileNode::class,
+ 'targetPermission' => $filePermission,
+ 'targetContentFile' => Environment::getPublicPath() . '/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-web-config',
+ ];
+ }
+
+ return $structure;
}
}
diff --git a/_.htaccess b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess
similarity index 100%
rename from _.htaccess
rename to typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-htaccess
diff --git a/_web.config b/typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-web-config
similarity index 100%
rename from _web.config
rename to typo3/sysext/install/Resources/Private/FolderStructureTemplateFiles/root-web-config
--
GitLab