[TASK] Use enumeration for handling conflicts in file names 94/42794/20
authorDaniel Goerz <ervaude@gmail.com>
Thu, 20 Aug 2015 22:11:11 +0000 (00:11 +0200)
committerMarkus Klein <markus.klein@typo3.org>
Wed, 2 Sep 2015 12:13:08 +0000 (14:13 +0200)
commit1aac4a14d070b97709ee2677c8385b58b3603cdf
tree2ef6a29328b2c0d0507f2790e1dde458a11e2aa8
parent5ca6e7dc38cd62b748b9545ac52de650020ca476
[TASK] Use enumeration for handling conflicts in file names

Conflicts in file names are handled with a list of plain
text values in the code. This patch adds a DuplicationBehavior
enumeration to improve the situation. It also streamlines the
redundant use of different strings for the same thing.

Change-Id: If07cacc77a4737bf52e6978dba79c22d72b7209c
Resolves: #55419
Releases: master
Reviewed-on: http://review.typo3.org/42794
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Frans Saris <franssaris@gmail.com>
15 files changed:
typo3/sysext/backend/Classes/Controller/File/FileController.php
typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js
typo3/sysext/core/Classes/Html/RteHtmlParser.php
typo3/sysext/core/Classes/Resource/AbstractFile.php
typo3/sysext/core/Classes/Resource/DuplicationBehavior.php [new file with mode: 0644]
typo3/sysext/core/Classes/Resource/Folder.php
typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
typo3/sysext/core/Classes/Resource/ResourceStorage.php
typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
typo3/sysext/core/Documentation/Changelog/7.4/Deprecation-63603-ExtendedFileUtilitydontCheckForUniqueIsDeprecated.rst
typo3/sysext/core/Documentation/Changelog/7.4/Deprecation-63603-FileControllerAndFileListControllerOverwriteExistingFilesChangedToStringValue.rst
typo3/sysext/core/Documentation/Changelog/master/Deprecation-55419-StreamlineFileConflictModeHandling.rst [new file with mode: 0644]
typo3/sysext/filelist/Classes/Controller/FileListController.php
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Classes/ImportExport.php