[BUGFIX] Default upload folder should be user_upload/

The default folder in FAL is set to temp. However, temp should
be used for temporary files like import/export t3d files,
not uploads by the user.
In 99% of the use case, the uploaded files should be accessible
by the frontend (which temp isn't because of a .htaccess file).
That's why the fileadmin/user_upload/ should always be
created in the install tool, AND the user_upload file
should be the default folder for the local driver.

Resolves: #46604
Releases: 6.1, 6.0
Change-Id: I79319bab4bad76c1af9e001a0a5146fae85ce59f
Reviewed-on: https://review.typo3.org/19241
Reviewed-by: Benjamin Mack
Tested-by: Benjamin Mack

diff --git a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
index 5f6303b..5fd9b01 100644 (file)
--- a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
@@ -180,10 +180,10 @@ class LocalDriver extends \TYPO3\CMS\Core\Resource\Driver\AbstractDriver {
         */
        public function getDefaultFolder() {
                if (!$this->defaultLevelFolder) {
-                       if (!file_exists(($this->absoluteBasePath . '_temp_/'))) {
-                               mkdir($this->absoluteBasePath . '_temp_/');
+                       if (!file_exists(($this->absoluteBasePath . 'user_upload/'))) {
+                               mkdir($this->absoluteBasePath . 'user_upload/');
                        }
-                       $this->defaultLevelFolder = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->createFolderObject($this->storage, '/_temp_/', '');
+                       $this->defaultLevelFolder = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->createFolderObject($this->storage, '/user_upload/', '');
                }
                return $this->defaultLevelFolder;
        }

diff --git a/typo3/sysext/install/Classes/Installer.php b/typo3/sysext/install/Classes/Installer.php
index 71f1648..848c63b 100644 (file)
--- a/typo3/sysext/install/Classes/Installer.php
+++ b/typo3/sysext/install/Classes/Installer.php
@@ -2498,7 +2498,8 @@ REMOTE_ADDR was \'' . \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('REMOTE
                        'uploads/pics/' => array('Typical location for uploaded files (images especially).', 0),
                        'uploads/media/' => array('Typical location for uploaded files (non-images especially).', 0),
                        $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] => array('Location for local files such as templates, independent uploads etc.', -1),
-                       $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . '_temp_/' => array('Typical temporary location for default upload of files by administrators.', 0)
+                       $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . '_temp_/' => array('Typical temporary location for default upload of administrative files like import/export data, used by administrators.', 0),
+                       $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] . 'user_upload/' => array('Default upload location for images by editors via Rich Text Editor and upload fields in the backend.', 0)
                );
                foreach ($checkWrite as $relpath => $descr) {
                        // Check typo3temp/