fabarea / media

Classes/Tool/DuplicateRecordsFinderTool.php

Indentation +80 added lines, -80 removed lines

@@ -20,86 +20,86 @@
 class DuplicateRecordsFinderTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find duplicate Records';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $duplicateRecordsReports = [];
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            if ($storage->isOnline()) {
-                $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
-                $duplicateRecordsReports[] = array(
-                    'storage' => $storage,
-                    'duplicateFiles' => $duplicateFiles,
-                    'numberOfDuplicateFiles' => count($duplicateFiles),
-                );
-            }
-        }
-
-        $view->assign('duplicateRecordsReports', $duplicateRecordsReports);
-
-        return $view->render();
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find duplicate Records';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$duplicateRecordsReports = [];
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			if ($storage->isOnline()) {
+				$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
+				$duplicateRecordsReports[] = array(
+					'storage' => $storage,
+					'duplicateFiles' => $duplicateFiles,
+					'numberOfDuplicateFiles' => count($duplicateFiles),
+				);
+			}
+		}
+
+		$view->assign('duplicateRecordsReports', $duplicateRecordsReports);
+
+		return $view->render();
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 
 }
 

Classes/FileUpload/UploadManager.php

Indentation +357 added lines, -357 removed lines

@@ -21,362 +21,362 @@
 class UploadManager
 {
 
-    const UPLOAD_FOLDER = 'typo3temp/pics';
-
-    /**
-     * @var int|null|string
-     */
-    protected $sizeLimit;
-
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var FormUtility
-     */
-    protected $formUtility;
-
-    /**
-     * @var \TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    protected $storage;
-
-    /**
-     * Name of the file input in the DOM.
-     *
-     * @var string
-     */
-    protected $inputName = 'qqfile';
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return UploadManager
-     */
-    function __construct($storage = null)
-    {
-
-        $this->initializeUploadFolder();
-
-        // max file size in bytes
-        $this->sizeLimit = GeneralUtility::getMaxUploadFileSize() * 1024;
-        $this->checkServerSettings();
-
-        $this->formUtility = FormUtility::getInstance();
-        $this->storage = $storage;
-    }
-
-    /**
-     * Handle the uploaded file.
-     *
-     * @return UploadedFileInterface
-     */
-    public function handleUpload()
-    {
-
-        /** @var $uploadedFile UploadedFileInterface */
-        $uploadedFile = false;
-        if ($this->formUtility->isMultiparted()) {
-
-            // Default case
-            $uploadedFile = GeneralUtility::makeInstance(\Fab\Media\FileUpload\MultipartedFile::class);
-        } elseif ($this->formUtility->isOctetStreamed()) {
-
-            // Fine Upload plugin would use it if forceEncoded = false and paramsInBody = false
-            $uploadedFile = GeneralUtility::makeInstance(\Fab\Media\FileUpload\StreamedFile::class);
-        } elseif ($this->formUtility->isUrlEncoded()) {
-
-            // Used for image resizing in BE
-            $uploadedFile = GeneralUtility::makeInstance(\Fab\Media\FileUpload\Base64File::class);
-        }
-
-        if (!$uploadedFile) {
-            $this->throwException('Could not instantiate an upload object... No file was uploaded?');
-        }
-
-        $fileName = $this->getFileName($uploadedFile);
-
-        $this->checkFileSize($uploadedFile->getSize());
-        $this->checkFileAllowed($fileName);
-
-        $saved = $uploadedFile->setInputName($this->inputName)
-            ->setUploadFolder($this->uploadFolder)
-            ->setName($fileName)
-            ->save();
-
-        if (!$saved) {
-            $this->throwException('Could not save uploaded file. The upload was cancelled, or server error encountered');
-        }
-
-        // Optimize file if the uploaded file is an image.
-        if ($uploadedFile->getType() == \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE) {
-            $uploadedFile = ImageOptimizer::getInstance($this->storage)->optimize($uploadedFile);
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Internal function that checks if server's may sizes match the
-     * object's maximum size for uploads.
-     *
-     * @return void
-     */
-    protected function checkServerSettings()
-    {
-        $postSize = $this->toBytes(ini_get('post_max_size'));
-
-        $uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
-
-        if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
-            $size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
-            $this->throwException('increase post_max_size and upload_max_filesize to ' . $size);
-        }
-    }
-
-    /**
-     * Convert a given size with units to bytes.
-     *
-     * @param string $str
-     * @return int|string
-     */
-    protected function toBytes($str)
-    {
-        $val = trim($str);
-        $last = strtolower($str[strlen($str) - 1]);
-        switch ($last) {
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-        }
-        return $val;
-    }
-
-    /**
-     * Return a file name given an uploaded file
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return string
-     */
-    public function getFileName(UploadedFileInterface $uploadedFile)
-    {
-        $pathInfo = pathinfo($uploadedFile->getOriginalName());
-        $fileName = $this->sanitizeFileName($pathInfo['filename']);
-        $fileNameWithExtension = $fileName;
-        if (!empty($pathInfo['extension'])) {
-            $fileNameWithExtension = sprintf('%s.%s', $fileName, $pathInfo['extension']);
-        }
-        return $fileNameWithExtension;
-    }
-
-    /**
-     * Check whether the file size does not exceed the allowed limit
-     *
-     * @param int $size
-     */
-    public function checkFileSize($size)
-    {
-        if ($size == 0) {
-            $this->throwException('File is empty');
-        }
-
-        if ($size > $this->sizeLimit) {
-            $this->throwException('File is too large');
-        }
-    }
-
-    /**
-     * Check whether the file is allowed
-     *
-     * @param string $fileName
-     */
-    public function checkFileAllowed($fileName)
-    {
-        $isAllowed = $this->checkFileExtensionPermission($fileName);
-        if (!$isAllowed) {
-            $these = PermissionUtility::getInstance()->getAllowedExtensionList();
-            $this->throwException('File has an invalid extension, it should be one of ' . $these . '.');
-        }
-    }
-
-    /**
-     * If the fileName is given, check it against the
-     * TYPO3_CONF_VARS[BE][fileDenyPattern] + and if the file extension is allowed
-     *
-     * @see \TYPO3\CMS\Core\Resource\ResourceStorage->checkFileExtensionPermission($fileName);
-     * @param string $fileName Full filename
-     * @return boolean true if extension/filename is allowed
-     */
-    public function checkFileExtensionPermission($fileName)
-    {
-        $isAllowed = GeneralUtility::verifyFilenameAgainstDenyPattern($fileName);
-        if ($isAllowed) {
-            $fileInfo = GeneralUtility::split_fileref($fileName);
-            // Set up the permissions for the file extension
-            $fileExtensionPermissions = $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace'];
-            $fileExtensionPermissions['allow'] = GeneralUtility::uniqueList(strtolower($fileExtensionPermissions['allow']));
-            $fileExtensionPermissions['deny'] = GeneralUtility::uniqueList(strtolower($fileExtensionPermissions['deny']));
-            $fileExtension = strtolower($fileInfo['fileext']);
-            if ($fileExtension !== '') {
-                // If the extension is found amongst the allowed types, we return true immediately
-                if ($fileExtensionPermissions['allow'] === '*' || GeneralUtility::inList($fileExtensionPermissions['allow'], $fileExtension)) {
-                    return true;
-                }
-                // If the extension is found amongst the denied types, we return false immediately
-                if ($fileExtensionPermissions['deny'] === '*' || GeneralUtility::inList($fileExtensionPermissions['deny'], $fileExtension)) {
-                    return false;
-                }
-                // If no match we return true
-                return true;
-            } else {
-                if ($fileExtensionPermissions['allow'] === '*') {
-                    return true;
-                }
-                if ($fileExtensionPermissions['deny'] === '*') {
-                    return false;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Sanitize the file name for the web.
-     * It has been noticed issues when letting done this work by FAL. Give it a little hand.
-     *
-     * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L252
-     * @param string $fileName
-     * @param string $slug
-     * @param string $extra
-     * @return string
-     */
-    public function sanitizeFileName($fileName, $slug = '-', $extra = null)
-    {
-        return trim(preg_replace('~[^0-9a-z_' . preg_quote($extra, '~') . ']+~i', $slug, $this->unAccent($fileName)), $slug);
-    }
-
-    /**
-     * Remove accent from a string
-     *
-     * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L297
-     * @param $string
-     * @return string
-     */
-    protected function unAccent($string)
-    {
-        $searches = array('ç', 'æ', 'œ', 'á', 'é', 'í', 'ó', 'ú', 'à', 'è', 'ì', 'ò', 'ù', 'ä', 'ë', 'ï', 'ö', 'ü', 'ÿ', 'â', 'ê', 'î', 'ô', 'û', 'å', 'e', 'i', 'ø', 'u');
-        $replaces = array('c', 'ae', 'oe', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'y', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u');
-        $sanitizedString = str_replace($searches, $replaces, $string);
-
-        if (extension_loaded('intl') === true) {
-            $sanitizedString = \Normalizer::normalize($sanitizedString, \Normalizer::FORM_KD);
-        }
-        return $sanitizedString;
-    }
-
-    /**
-     * @throws FailedFileUploadException
-     * @param string $message
-     */
-    protected function throwException($message)
-    {
-        throw new FailedFileUploadException($message, 1357510420);
-    }
-
-    /**
-     * Initialize Upload Folder.
-     *
-     * @return void
-     */
-    protected function initializeUploadFolder()
-    {
-        $this->uploadFolder = Environment::getPublicPath() . '/' . self::UPLOAD_FOLDER;
-
-        // Initialize the upload folder for file transfer and create it if not yet existing
-        if (!file_exists($this->uploadFolder)) {
-            GeneralUtility::mkdir($this->uploadFolder);
-        }
-
-        // Check whether the upload folder is writable
-        if (!is_writable($this->uploadFolder)) {
-            $this->throwException("Server error. Upload directory isn't writable.");
-        }
-    }
-
-    /**
-     * @return int|null|string
-     */
-    public function getSizeLimit()
-    {
-        return $this->sizeLimit;
-    }
-
-    /**
-     * @param int|null|string $sizeLimit
-     * @return $this
-     */
-    public function setSizeLimit($sizeLimit)
-    {
-        $this->sizeLimit = $sizeLimit;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUploadFolder()
-    {
-        return $this->uploadFolder;
-    }
-
-    /**
-     * @param string $uploadFolder
-     * @return $this
-     */
-    public function setUploadFolder($uploadFolder)
-    {
-        $this->uploadFolder = $uploadFolder;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getInputName()
-    {
-        return $this->inputName;
-    }
-
-    /**
-     * @param string $inputName
-     * @return $this
-     */
-    public function setInputName($inputName)
-    {
-        $this->inputName = $inputName;
-        return $this;
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    public function getStorage()
-    {
-        return $this->storage;
-    }
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return $this
-     */
-    public function setStorage($storage)
-    {
-        $this->storage = $storage;
-        return $this;
-    }
+	const UPLOAD_FOLDER = 'typo3temp/pics';
+
+	/**
+	 * @var int|null|string
+	 */
+	protected $sizeLimit;
+
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var FormUtility
+	 */
+	protected $formUtility;
+
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	protected $storage;
+
+	/**
+	 * Name of the file input in the DOM.
+	 *
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return UploadManager
+	 */
+	function __construct($storage = null)
+	{
+
+		$this->initializeUploadFolder();
+
+		// max file size in bytes
+		$this->sizeLimit = GeneralUtility::getMaxUploadFileSize() * 1024;
+		$this->checkServerSettings();
+
+		$this->formUtility = FormUtility::getInstance();
+		$this->storage = $storage;
+	}
+
+	/**
+	 * Handle the uploaded file.
+	 *
+	 * @return UploadedFileInterface
+	 */
+	public function handleUpload()
+	{
+
+		/** @var $uploadedFile UploadedFileInterface */
+		$uploadedFile = false;
+		if ($this->formUtility->isMultiparted()) {
+
+			// Default case
+			$uploadedFile = GeneralUtility::makeInstance(\Fab\Media\FileUpload\MultipartedFile::class);
+		} elseif ($this->formUtility->isOctetStreamed()) {
+
+			// Fine Upload plugin would use it if forceEncoded = false and paramsInBody = false
+			$uploadedFile = GeneralUtility::makeInstance(\Fab\Media\FileUpload\StreamedFile::class);
+		} elseif ($this->formUtility->isUrlEncoded()) {
+
+			// Used for image resizing in BE
+			$uploadedFile = GeneralUtility::makeInstance(\Fab\Media\FileUpload\Base64File::class);
+		}
+
+		if (!$uploadedFile) {
+			$this->throwException('Could not instantiate an upload object... No file was uploaded?');
+		}
+
+		$fileName = $this->getFileName($uploadedFile);
+
+		$this->checkFileSize($uploadedFile->getSize());
+		$this->checkFileAllowed($fileName);
+
+		$saved = $uploadedFile->setInputName($this->inputName)
+			->setUploadFolder($this->uploadFolder)
+			->setName($fileName)
+			->save();
+
+		if (!$saved) {
+			$this->throwException('Could not save uploaded file. The upload was cancelled, or server error encountered');
+		}
+
+		// Optimize file if the uploaded file is an image.
+		if ($uploadedFile->getType() == \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE) {
+			$uploadedFile = ImageOptimizer::getInstance($this->storage)->optimize($uploadedFile);
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Internal function that checks if server's may sizes match the
+	 * object's maximum size for uploads.
+	 *
+	 * @return void
+	 */
+	protected function checkServerSettings()
+	{
+		$postSize = $this->toBytes(ini_get('post_max_size'));
+
+		$uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
+
+		if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
+			$size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
+			$this->throwException('increase post_max_size and upload_max_filesize to ' . $size);
+		}
+	}
+
+	/**
+	 * Convert a given size with units to bytes.
+	 *
+	 * @param string $str
+	 * @return int|string
+	 */
+	protected function toBytes($str)
+	{
+		$val = trim($str);
+		$last = strtolower($str[strlen($str) - 1]);
+		switch ($last) {
+			case 'g':
+				$val *= 1024;
+			case 'm':
+				$val *= 1024;
+			case 'k':
+				$val *= 1024;
+		}
+		return $val;
+	}
+
+	/**
+	 * Return a file name given an uploaded file
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return string
+	 */
+	public function getFileName(UploadedFileInterface $uploadedFile)
+	{
+		$pathInfo = pathinfo($uploadedFile->getOriginalName());
+		$fileName = $this->sanitizeFileName($pathInfo['filename']);
+		$fileNameWithExtension = $fileName;
+		if (!empty($pathInfo['extension'])) {
+			$fileNameWithExtension = sprintf('%s.%s', $fileName, $pathInfo['extension']);
+		}
+		return $fileNameWithExtension;
+	}
+
+	/**
+	 * Check whether the file size does not exceed the allowed limit
+	 *
+	 * @param int $size
+	 */
+	public function checkFileSize($size)
+	{
+		if ($size == 0) {
+			$this->throwException('File is empty');
+		}
+
+		if ($size > $this->sizeLimit) {
+			$this->throwException('File is too large');
+		}
+	}
+
+	/**
+	 * Check whether the file is allowed
+	 *
+	 * @param string $fileName
+	 */
+	public function checkFileAllowed($fileName)
+	{
+		$isAllowed = $this->checkFileExtensionPermission($fileName);
+		if (!$isAllowed) {
+			$these = PermissionUtility::getInstance()->getAllowedExtensionList();
+			$this->throwException('File has an invalid extension, it should be one of ' . $these . '.');
+		}
+	}
+
+	/**
+	 * If the fileName is given, check it against the
+	 * TYPO3_CONF_VARS[BE][fileDenyPattern] + and if the file extension is allowed
+	 *
+	 * @see \TYPO3\CMS\Core\Resource\ResourceStorage->checkFileExtensionPermission($fileName);
+	 * @param string $fileName Full filename
+	 * @return boolean true if extension/filename is allowed
+	 */
+	public function checkFileExtensionPermission($fileName)
+	{
+		$isAllowed = GeneralUtility::verifyFilenameAgainstDenyPattern($fileName);
+		if ($isAllowed) {
+			$fileInfo = GeneralUtility::split_fileref($fileName);
+			// Set up the permissions for the file extension
+			$fileExtensionPermissions = $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace'];
+			$fileExtensionPermissions['allow'] = GeneralUtility::uniqueList(strtolower($fileExtensionPermissions['allow']));
+			$fileExtensionPermissions['deny'] = GeneralUtility::uniqueList(strtolower($fileExtensionPermissions['deny']));
+			$fileExtension = strtolower($fileInfo['fileext']);
+			if ($fileExtension !== '') {
+				// If the extension is found amongst the allowed types, we return true immediately
+				if ($fileExtensionPermissions['allow'] === '*' || GeneralUtility::inList($fileExtensionPermissions['allow'], $fileExtension)) {
+					return true;
+				}
+				// If the extension is found amongst the denied types, we return false immediately
+				if ($fileExtensionPermissions['deny'] === '*' || GeneralUtility::inList($fileExtensionPermissions['deny'], $fileExtension)) {
+					return false;
+				}
+				// If no match we return true
+				return true;
+			} else {
+				if ($fileExtensionPermissions['allow'] === '*') {
+					return true;
+				}
+				if ($fileExtensionPermissions['deny'] === '*') {
+					return false;
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Sanitize the file name for the web.
+	 * It has been noticed issues when letting done this work by FAL. Give it a little hand.
+	 *
+	 * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L252
+	 * @param string $fileName
+	 * @param string $slug
+	 * @param string $extra
+	 * @return string
+	 */
+	public function sanitizeFileName($fileName, $slug = '-', $extra = null)
+	{
+		return trim(preg_replace('~[^0-9a-z_' . preg_quote($extra, '~') . ']+~i', $slug, $this->unAccent($fileName)), $slug);
+	}
+
+	/**
+	 * Remove accent from a string
+	 *
+	 * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L297
+	 * @param $string
+	 * @return string
+	 */
+	protected function unAccent($string)
+	{
+		$searches = array('ç', 'æ', 'œ', 'á', 'é', 'í', 'ó', 'ú', 'à', 'è', 'ì', 'ò', 'ù', 'ä', 'ë', 'ï', 'ö', 'ü', 'ÿ', 'â', 'ê', 'î', 'ô', 'û', 'å', 'e', 'i', 'ø', 'u');
+		$replaces = array('c', 'ae', 'oe', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'y', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u');
+		$sanitizedString = str_replace($searches, $replaces, $string);
+
+		if (extension_loaded('intl') === true) {
+			$sanitizedString = \Normalizer::normalize($sanitizedString, \Normalizer::FORM_KD);
+		}
+		return $sanitizedString;
+	}
+
+	/**
+	 * @throws FailedFileUploadException
+	 * @param string $message
+	 */
+	protected function throwException($message)
+	{
+		throw new FailedFileUploadException($message, 1357510420);
+	}
+
+	/**
+	 * Initialize Upload Folder.
+	 *
+	 * @return void
+	 */
+	protected function initializeUploadFolder()
+	{
+		$this->uploadFolder = Environment::getPublicPath() . '/' . self::UPLOAD_FOLDER;
+
+		// Initialize the upload folder for file transfer and create it if not yet existing
+		if (!file_exists($this->uploadFolder)) {
+			GeneralUtility::mkdir($this->uploadFolder);
+		}
+
+		// Check whether the upload folder is writable
+		if (!is_writable($this->uploadFolder)) {
+			$this->throwException("Server error. Upload directory isn't writable.");
+		}
+	}
+
+	/**
+	 * @return int|null|string
+	 */
+	public function getSizeLimit()
+	{
+		return $this->sizeLimit;
+	}
+
+	/**
+	 * @param int|null|string $sizeLimit
+	 * @return $this
+	 */
+	public function setSizeLimit($sizeLimit)
+	{
+		$this->sizeLimit = $sizeLimit;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUploadFolder()
+	{
+		return $this->uploadFolder;
+	}
+
+	/**
+	 * @param string $uploadFolder
+	 * @return $this
+	 */
+	public function setUploadFolder($uploadFolder)
+	{
+		$this->uploadFolder = $uploadFolder;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getInputName()
+	{
+		return $this->inputName;
+	}
+
+	/**
+	 * @param string $inputName
+	 * @return $this
+	 */
+	public function setInputName($inputName)
+	{
+		$this->inputName = $inputName;
+		return $this;
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	public function getStorage()
+	{
+		return $this->storage;
+	}
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return $this
+	 */
+	public function setStorage($storage)
+	{
+		$this->storage = $storage;
+		return $this;
+	}
 
 }

Classes/FileUpload/UploadedFileAbstract.php

Indentation +137 added lines, -137 removed lines

@@ -19,142 +19,142 @@
 abstract class UploadedFileAbstract implements UploadedFileInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $inputName;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Get the file type.
-     *
-     * @return int
-     */
-    public function getType()
-    {
-        $this->checkFileExistence();
-
-        // this basically extracts the mimetype and guess the filetype based
-        // on the first part of the mimetype works for 99% of all cases, and
-        // we don't need to make an SQL statement like EXT:media does currently
-        $mimeType = $this->getMimeType();
-        list($fileType) = explode('/', $mimeType);
-        switch (strtolower($fileType)) {
-            case 'text':
-                $type = File::FILETYPE_TEXT;
-                break;
-            case 'image':
-                $type = File::FILETYPE_IMAGE;
-                break;
-            case 'audio':
-                $type = File::FILETYPE_AUDIO;
-                break;
-            case 'video':
-                $type = File::FILETYPE_VIDEO;
-                break;
-            case 'application':
-            case 'software':
-                $type = File::FILETYPE_APPLICATION;
-                break;
-            default:
-                $type = File::FILETYPE_UNKNOWN;
-        }
-        return $type;
-    }
-
-    /**
-     * Get the file with its absolute path.
-     *
-     * @return string
-     */
-    public function getFileWithAbsolutePath()
-    {
-        return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
-    }
-
-    /**
-     * Get the file's public URL.
-     *
-     * @return string
-     */
-    public function getPublicUrl()
-    {
-        $fileNameAndPath = str_replace(Environment::getPublicPath() . '/', '', $this->getFileWithAbsolutePath());
-        return '/' . ltrim($fileNameAndPath, '/');
-    }
-
-    /**
-     * @return string
-     */
-    public function getInputName()
-    {
-        return $this->inputName;
-    }
-
-    /**
-     * @param string $inputName
-     * @return UploadedFileInterface
-     */
-    public function setInputName($inputName)
-    {
-        $this->inputName = $inputName;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUploadFolder()
-    {
-        return $this->uploadFolder;
-    }
-
-    /**
-     * @param string $uploadFolder
-     * @return UploadedFileInterface
-     */
-    public function setUploadFolder($uploadFolder)
-    {
-        $this->uploadFolder = $uploadFolder;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     * @return UploadedFileInterface
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * Check whether the file exists.
-     */
-    protected function checkFileExistence()
-    {
-        if (!is_file($this->getFileWithAbsolutePath())) {
-            $message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
-            throw new MissingFileException($message, 1361786958);
-        }
-    }
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $inputName;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Get the file type.
+	 *
+	 * @return int
+	 */
+	public function getType()
+	{
+		$this->checkFileExistence();
+
+		// this basically extracts the mimetype and guess the filetype based
+		// on the first part of the mimetype works for 99% of all cases, and
+		// we don't need to make an SQL statement like EXT:media does currently
+		$mimeType = $this->getMimeType();
+		list($fileType) = explode('/', $mimeType);
+		switch (strtolower($fileType)) {
+			case 'text':
+				$type = File::FILETYPE_TEXT;
+				break;
+			case 'image':
+				$type = File::FILETYPE_IMAGE;
+				break;
+			case 'audio':
+				$type = File::FILETYPE_AUDIO;
+				break;
+			case 'video':
+				$type = File::FILETYPE_VIDEO;
+				break;
+			case 'application':
+			case 'software':
+				$type = File::FILETYPE_APPLICATION;
+				break;
+			default:
+				$type = File::FILETYPE_UNKNOWN;
+		}
+		return $type;
+	}
+
+	/**
+	 * Get the file with its absolute path.
+	 *
+	 * @return string
+	 */
+	public function getFileWithAbsolutePath()
+	{
+		return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
+	}
+
+	/**
+	 * Get the file's public URL.
+	 *
+	 * @return string
+	 */
+	public function getPublicUrl()
+	{
+		$fileNameAndPath = str_replace(Environment::getPublicPath() . '/', '', $this->getFileWithAbsolutePath());
+		return '/' . ltrim($fileNameAndPath, '/');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getInputName()
+	{
+		return $this->inputName;
+	}
+
+	/**
+	 * @param string $inputName
+	 * @return UploadedFileInterface
+	 */
+	public function setInputName($inputName)
+	{
+		$this->inputName = $inputName;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUploadFolder()
+	{
+		return $this->uploadFolder;
+	}
+
+	/**
+	 * @param string $uploadFolder
+	 * @return UploadedFileInterface
+	 */
+	public function setUploadFolder($uploadFolder)
+	{
+		$this->uploadFolder = $uploadFolder;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 * @return UploadedFileInterface
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * Check whether the file exists.
+	 */
+	protected function checkFileExistence()
+	{
+		if (!is_file($this->getFileWithAbsolutePath())) {
+			$message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
+			throw new MissingFileException($message, 1361786958);
+		}
+	}
 
 }

Classes/Command/FileCacheCommandController.php

Indentation +100 added lines, -100 removed lines

@@ -25,105 +25,105 @@
 class FileCacheCommandController extends CommandController
 {
 
-    /**
-     * Warm up the cache. Update some caching columns such as "number_of_references" to speed up the search.
-     *
-     * @return void
-     */
-    public function warmUpCommand()
-    {
-        $numberOfEntries = $this->getCacheService()->warmUp();
-        $message = sprintf('Done! Processed %s entries', $numberOfEntries);
-        $this->outputLine($message);
-    }
-
-    /**
-     * Flush all processed files to be used for debugging mainly.
-     *
-     * @return void
-     */
-    public function flushProcessedFilesCommand()
-    {
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // This only works for local driver
-            if ($storage->getDriverType() === 'Local') {
-
-                $this->outputLine();
-                $this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-                $this->outputLine('--------------------------------------------');
-                $this->outputLine();
-
-                #$storage->getProcessingFolder()->delete(true); // will not work
-
-                // Well... not really FAL friendly but straightforward for Local drivers.
-                $processedDirectoryPath = Environment::getPublicPath() . '/' . $storage->getProcessingFolder()->getPublicUrl();
-                $fileIterator = new FilesystemIterator($processedDirectoryPath, FilesystemIterator::SKIP_DOTS);
-                $numberOfProcessedFiles = iterator_count($fileIterator);
-
-                GeneralUtility::rmdir($processedDirectoryPath, true);
-                GeneralUtility::mkdir($processedDirectoryPath); // recreate the directory.
-
-                $message = sprintf('Done! Removed %s processed file(s).', $numberOfProcessedFiles);
-                $this->outputLine($message);
-
-                $count = $this->getDataService()
-                    ->count(
-                        'sys_file_processedfile',
-                        [
-                            'storage' => $storage->getUid()
-                        ]
-                    );
-
-                // Remove the record as well.
-                $this->getDataService()->delete('sys_file_processedfile', ['storage' => $storage->getUid()]);
-
-                $message = sprintf('Done! Removed %s records from "sys_file_processedfile".', $count);
-                $this->outputLine($message);
-            }
-
-        }
-
-        // Remove possible remaining "sys_file_processedfile"
-        $this
-            ->getConnection('sys_file_processedfile')
-            ->query('TRUNCATE sys_file_processedfile');
-    }
-
-    /**
-     * @return \Fab\Media\Cache\CacheService|object
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|Connection
-     */
-    protected function getConnection($tableName): Connection
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getConnectionForTable($tableName);
-    }
+	/**
+	 * Warm up the cache. Update some caching columns such as "number_of_references" to speed up the search.
+	 *
+	 * @return void
+	 */
+	public function warmUpCommand()
+	{
+		$numberOfEntries = $this->getCacheService()->warmUp();
+		$message = sprintf('Done! Processed %s entries', $numberOfEntries);
+		$this->outputLine($message);
+	}
+
+	/**
+	 * Flush all processed files to be used for debugging mainly.
+	 *
+	 * @return void
+	 */
+	public function flushProcessedFilesCommand()
+	{
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// This only works for local driver
+			if ($storage->getDriverType() === 'Local') {
+
+				$this->outputLine();
+				$this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+				$this->outputLine('--------------------------------------------');
+				$this->outputLine();
+
+				#$storage->getProcessingFolder()->delete(true); // will not work
+
+				// Well... not really FAL friendly but straightforward for Local drivers.
+				$processedDirectoryPath = Environment::getPublicPath() . '/' . $storage->getProcessingFolder()->getPublicUrl();
+				$fileIterator = new FilesystemIterator($processedDirectoryPath, FilesystemIterator::SKIP_DOTS);
+				$numberOfProcessedFiles = iterator_count($fileIterator);
+
+				GeneralUtility::rmdir($processedDirectoryPath, true);
+				GeneralUtility::mkdir($processedDirectoryPath); // recreate the directory.
+
+				$message = sprintf('Done! Removed %s processed file(s).', $numberOfProcessedFiles);
+				$this->outputLine($message);
+
+				$count = $this->getDataService()
+					->count(
+						'sys_file_processedfile',
+						[
+							'storage' => $storage->getUid()
+						]
+					);
+
+				// Remove the record as well.
+				$this->getDataService()->delete('sys_file_processedfile', ['storage' => $storage->getUid()]);
+
+				$message = sprintf('Done! Removed %s records from "sys_file_processedfile".', $count);
+				$this->outputLine($message);
+			}
+
+		}
+
+		// Remove possible remaining "sys_file_processedfile"
+		$this
+			->getConnection('sys_file_processedfile')
+			->query('TRUNCATE sys_file_processedfile');
+	}
+
+	/**
+	 * @return \Fab\Media\Cache\CacheService|object
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|Connection
+	 */
+	protected function getConnection($tableName): Connection
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getConnectionForTable($tableName);
+	}
 
 }

Classes/Index/IndexAnalyser.php

Indentation +160 added lines, -160 removed lines

@@ -22,169 +22,169 @@
 class IndexAnalyser implements SingletonInterface
 {
 
-    /**
-     * Return missing file for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     */
-    public function searchForMissingFiles(ResourceStorage $storage)
-    {
-
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $missingFiles = [];
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )->execute();
-        while ($row = $statement->fetchAssociative()) {
-
-            // This task is very memory consuming on large data set e.g > 20'000 records.
-            // We must think of having a pagination if there is the need for such thing.
-            $file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
-            if (!$file->exists()) {
-                $missingFiles[] = $file;
-            }
-        }
-        return $missingFiles;
-    }
-
-    /**
-     * Deletes all missing files for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function deleteMissingFiles(ResourceStorage $storage)
-    {
-        /** @var FileReferenceService $fileReferenceService */
-        $fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
-        $missingFiles = $this->searchForMissingFiles($storage);
-        $deletedFiles = [];
-
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-
-        /** @var \TYPO3\CMS\Core\Resource\File $missingFile */
-        foreach ($missingFiles as $missingFile) {
-            try {
-                // if missingFile has no file references
-                if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
-                    // The case is special as we have a missing file in the file system
-                    // As a result, we can't use $fileObject->delete(); which will
-                    // raise exception "Error while fetching permissions"
-                    $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-                    $queryBuilder->delete('sys_file')
-                        ->where($queryBuilder->expr()->eq('uid', $missingFile->getUid()))
-                        ->execute();
-
-                    $deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-        return $deletedFiles;
-    }
-
-    /*
+	/**
+	 * Return missing file for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForMissingFiles(ResourceStorage $storage)
+	{
+
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$missingFiles = [];
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)->execute();
+		while ($row = $statement->fetchAssociative()) {
+
+			// This task is very memory consuming on large data set e.g > 20'000 records.
+			// We must think of having a pagination if there is the need for such thing.
+			$file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
+			if (!$file->exists()) {
+				$missingFiles[] = $file;
+			}
+		}
+		return $missingFiles;
+	}
+
+	/**
+	 * Deletes all missing files for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function deleteMissingFiles(ResourceStorage $storage)
+	{
+		/** @var FileReferenceService $fileReferenceService */
+		$fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
+		$missingFiles = $this->searchForMissingFiles($storage);
+		$deletedFiles = [];
+
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+
+		/** @var \TYPO3\CMS\Core\Resource\File $missingFile */
+		foreach ($missingFiles as $missingFile) {
+			try {
+				// if missingFile has no file references
+				if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
+					// The case is special as we have a missing file in the file system
+					// As a result, we can't use $fileObject->delete(); which will
+					// raise exception "Error while fetching permissions"
+					$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+					$queryBuilder->delete('sys_file')
+						->where($queryBuilder->expr()->eq('uid', $missingFile->getUid()))
+						->execute();
+
+					$deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+		return $deletedFiles;
+	}
+
+	/*
      * Return duplicates file records
      *
      * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
      * @return array
      */
-    public function searchForDuplicateIdentifiers(ResourceStorage $storage)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )
-            ->groupby('identifier')
-            ->having('count(*) > 1')
-            ->execute();
-
-        // Detect duplicate records.
-        $duplicates = [];
-        while ($row = $statement->fetchAssociative()) {
-
-            $records = $queryBuilder
-                ->select('*')
-                ->from('sys_file')
-                ->where(
-                    $queryBuilder->expr()->eq('storage', $storage->getUid())
-                )
-                ->andWhere(
-                    $queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['identifier']))
-                )
-                ->execute();
-            $records = $records->fetchAllAssociative();
-            $duplicates[$row['identifier']] = $records;
-        }
-        return $duplicates;
-    }
-
-    /**
-     * Return duplicates file records
-     *
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return array
-     */
-    public function searchForDuplicateSha1(ResourceStorage $storage)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )
-            ->groupby('sha1')
-            ->having('count(*) > 1')
-            ->execute();
-
-        // Detect duplicate records.
-        $duplicates = [];
-        while ($row = $statement->fetchAssociative()) {
-
-            $records = $queryBuilder
-                ->select('*')
-                ->from('sys_file')
-                ->where(
-                    $queryBuilder->expr()->eq('storage', $storage->getUid())
-                )
-                ->andWhere(
-                    $queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['sha1']))
-                )
-                ->execute();
-            $records = $records->fetchAllAssociative();
-            $duplicates[$row['sha1']] = $records;
-        }
-        return $duplicates;
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
+	public function searchForDuplicateIdentifiers(ResourceStorage $storage)
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)
+			->groupby('identifier')
+			->having('count(*) > 1')
+			->execute();
+
+		// Detect duplicate records.
+		$duplicates = [];
+		while ($row = $statement->fetchAssociative()) {
+
+			$records = $queryBuilder
+				->select('*')
+				->from('sys_file')
+				->where(
+					$queryBuilder->expr()->eq('storage', $storage->getUid())
+				)
+				->andWhere(
+					$queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['identifier']))
+				)
+				->execute();
+			$records = $records->fetchAllAssociative();
+			$duplicates[$row['identifier']] = $records;
+		}
+		return $duplicates;
+	}
+
+	/**
+	 * Return duplicates file records
+	 *
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForDuplicateSha1(ResourceStorage $storage)
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)
+			->groupby('sha1')
+			->having('count(*) > 1')
+			->execute();
+
+		// Detect duplicate records.
+		$duplicates = [];
+		while ($row = $statement->fetchAssociative()) {
+
+			$records = $queryBuilder
+				->select('*')
+				->from('sys_file')
+				->where(
+					$queryBuilder->expr()->eq('storage', $storage->getUid())
+				)
+				->andWhere(
+					$queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['sha1']))
+				)
+				->execute();
+			$records = $records->fetchAllAssociative();
+			$duplicates[$row['sha1']] = $records;
+		}
+		return $duplicates;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
 }

ext_localconf.php

Indentation +27 added lines, -27 removed lines

@@ -3,39 +3,39 @@
 
 call_user_func(function () {
 
-    $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-        \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
-    )->get('media');
+	$configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+		\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
+	)->get('media');
 
-    $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeRegistry'][1547054767] = [
-        'nodeName' => 'findUploader',
-        'priority' => 40,
-        'class' => \Fab\Media\Backend\TceForms::class,
-    ];
+	$GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeRegistry'][1547054767] = [
+		'nodeName' => 'findUploader',
+		'priority' => 40,
+		'class' => \Fab\Media\Backend\TceForms::class,
+	];
 
-    $disableTitleMetadataExtractor = isset($configuration['disable_title_metadata_extractor']) ? $configuration['disable_title_metadata_extractor'] : FALSE;
-    if (!$disableTitleMetadataExtractor) {
+	$disableTitleMetadataExtractor = isset($configuration['disable_title_metadata_extractor']) ? $configuration['disable_title_metadata_extractor'] : FALSE;
+	if (!$disableTitleMetadataExtractor) {
 
-        // Register basic metadata extractor. Will feed the file with a "title" when indexing, e.g. upload, through scheduler
-        \TYPO3\CMS\Core\Resource\Index\ExtractorRegistry::getInstance()->registerExtractionService(\Fab\Media\Index\TitleMetadataExtractor::class );
-    }
+		// Register basic metadata extractor. Will feed the file with a "title" when indexing, e.g. upload, through scheduler
+		\TYPO3\CMS\Core\Resource\Index\ExtractorRegistry::getInstance()->registerExtractionService(\Fab\Media\Index\TitleMetadataExtractor::class );
+	}
 
-    // Hook for traditional file upload, trigger metadata indexing as well.
-    // Could be done at the Core level in the future...
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_extfilefunc.php']['processData'][] = 'Fab\Media\Hook\FileUploadHook';
+	// Hook for traditional file upload, trigger metadata indexing as well.
+	// Could be done at the Core level in the future...
+	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_extfilefunc.php']['processData'][] = 'Fab\Media\Hook\FileUploadHook';
 
-    if (TYPO3_MODE === 'BE') {
+	if (TYPO3_MODE === 'BE') {
 
-        // Special process to fill column "usage" which indicates the total number of file reference including soft references.
-        $GLOBALS ['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'Fab\Media\Hook\DataHandlerHook';
+		// Special process to fill column "usage" which indicates the total number of file reference including soft references.
+		$GLOBALS ['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'Fab\Media\Hook\DataHandlerHook';
 
-        $hasMediaFilePicker = isset($configuration['has_media_file_picker']) ? $configuration['has_media_file_picker'] : FALSE;
-        if ($hasMediaFilePicker) {
+		$hasMediaFilePicker = isset($configuration['has_media_file_picker']) ? $configuration['has_media_file_picker'] : FALSE;
+		if ($hasMediaFilePicker) {
 
-            // Override classes for the Object Manager.
-            $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Backend\Form\FormResultCompiler::class] = array(
-                'className' => \Fab\Media\Override\Backend\Form\FormResultCompiler::class
-            );
-        }
-    }
+			// Override classes for the Object Manager.
+			$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Backend\Form\FormResultCompiler::class] = array(
+				'className' => \Fab\Media\Override\Backend\Form\FormResultCompiler::class
+			);
+		}
+	}
 });
\ No newline at end of file

ext_emconf.php

Indentation +26 added lines, -26 removed lines

@@ -1,30 +1,30 @@
 <?php
 
 $EM_CONF[$_EXTKEY] = [
-    'title' => 'Media management',
-    'description' => 'Media management system for TYPO3 CMS.',
-    'category' => 'module',
-    'author' => 'Fabien Udriot',
-    'author_email' => 'fabien@ecodev.ch',
-    'state' => 'stable',
-    'version' => '5.2.0-dev',
-    'autoload' => [
-        'psr-4' => ['Fab\\Media\\' => 'Classes']
-    ],
-    'constraints' =>
-        [
-            'depends' =>
-                [
-                    'typo3' => '10.4.0-10.4.99',
-                    'vidi' => '4.0.0-0.0.0',
-                ],
-            'conflicts' =>
-                [
-                ],
-            'suggests' =>
-                [
-                    'metadata' => '',
-                    'filemetadata' => '',
-                ],
-        ]
+	'title' => 'Media management',
+	'description' => 'Media management system for TYPO3 CMS.',
+	'category' => 'module',
+	'author' => 'Fabien Udriot',
+	'author_email' => 'fabien@ecodev.ch',
+	'state' => 'stable',
+	'version' => '5.2.0-dev',
+	'autoload' => [
+		'psr-4' => ['Fab\\Media\\' => 'Classes']
+	],
+	'constraints' =>
+		[
+			'depends' =>
+				[
+					'typo3' => '10.4.0-10.4.99',
+					'vidi' => '4.0.0-0.0.0',
+				],
+			'conflicts' =>
+				[
+				],
+			'suggests' =>
+				[
+					'metadata' => '',
+					'filemetadata' => '',
+				],
+		]
 ];

Classes/Backend/TceForms.php

Indentation +32 added lines, -32 removed lines

@@ -20,37 +20,37 @@
 class TceForms extends AbstractFormElement
 {
 
-    /**
-     * @return array
-     */
-    public function render()
-    {
-        // Load StyleSheets in the Page Renderer
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $cssFile = ExtensionManagementUtility::extPath('media') . 'Resources/Public/StyleSheets/fineuploader.tce.css';
-        $pageRenderer->addCssFile($cssFile);
-
-        // language labels for JavaScript files
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
-
-        // js files to be loaded
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core') . 'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/JavaScript/Encoder.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
-
-        $result = $this->initializeResultArray();
-
-        $fileMetadataRecord = $this->data['databaseRow'];
-
-        if ($fileMetadataRecord['file'] <= 0) {
-            throw new \Exception('I could not find a valid file identifier', 1392926871);
-        }
-
-        /** @var $fileUpload \Fab\Media\Form\FileUploadTceForms */
-        $fileUpload = GeneralUtility::makeInstance(\Fab\Media\Form\FileUploadTceForms::class);
-        $fileUpload->setValue($fileMetadataRecord['file'][0])->setPrefix(MediaModule::getParameterPrefix());
-        $result['html'] = $fileUpload->render();
-        return $result;
-    }
+	/**
+	 * @return array
+	 */
+	public function render()
+	{
+		// Load StyleSheets in the Page Renderer
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$cssFile = ExtensionManagementUtility::extPath('media') . 'Resources/Public/StyleSheets/fineuploader.tce.css';
+		$pageRenderer->addCssFile($cssFile);
+
+		// language labels for JavaScript files
+		$pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+
+		// js files to be loaded
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core') . 'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/JavaScript/Encoder.js');
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
+
+		$result = $this->initializeResultArray();
+
+		$fileMetadataRecord = $this->data['databaseRow'];
+
+		if ($fileMetadataRecord['file'] <= 0) {
+			throw new \Exception('I could not find a valid file identifier', 1392926871);
+		}
+
+		/** @var $fileUpload \Fab\Media\Form\FileUploadTceForms */
+		$fileUpload = GeneralUtility::makeInstance(\Fab\Media\Form\FileUploadTceForms::class);
+		$fileUpload->setValue($fileMetadataRecord['file'][0])->setPrefix(MediaModule::getParameterPrefix());
+		$result['html'] = $fileUpload->render();
+		return $result;
+	}
 
 }

Classes/Controller/AssetController.php

Indentation +309 added lines, -309 removed lines

@@ -42,314 +42,314 @@
 class AssetController extends ActionController
 {
 
-    /**
-     * @var string
-     */
-    protected $dataType = 'sys_file';
-
-    /**
-     * @throws \Fab\Media\Exception\StorageNotOnlineException
-     * @throws \InvalidArgumentException
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
-     */
-    public function initializeAction()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-
-            /** @var FileConverter $typeConverter */
-            $typeConverter = $this->objectManager->get(FileConverter::class);
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * Force download of the file.
-     *
-     * @param File $file
-     * @param bool $forceDownload
-     * @return bool|string
-     * @throws \RuntimeException
-     */
-    public function downloadAction(File $file, $forceDownload = false)
-    {
-
-        if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
-
-            // Emit signal before downloading the file.
-            $this->emitBeforeDownloadSignal($file);
-
-            // Read the file and dump it with the flag "forceDownload" set to true or false.
-            $file->getStorage()->dumpFileContents($file, $forceDownload);
-
-            $result = true;
-        } else {
-            $result = 'Access denied!';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Handle file upload for a new file.
-     *
-     * @param string $combinedIdentifier
-     * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
-     * @return string
-     */
-    public function createAction($combinedIdentifier)
-    {
-        /** @var UploadedFileInterface $uploadedFile */
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
-        }
-
-        // Get the target folder.
-        if ($this->getMediaModule()->hasFolderTree()) {
-            $targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
-        } else {
-            $storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-            $targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
-        }
-
-        try {
-            $conflictMode = DuplicationBehavior::RENAME;
-            $fileName = $uploadedFile->getName();
-            $file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->extractMetadata($file)
-                ->applyDefaultCategories($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
-    }
-
-    /**
-     * Handle file upload for an existing file.
-     *
-     * @param File $file
-     * @return string
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
-    public function updateAction(File $file)
-    {
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
-        }
-
-        /** @var $file File */
-        $targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
-
-        try {
-            $storage = $file->getStorage();
-            $storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->updateIndex($file)
-                ->extractMetadata($file);
-
-            // Clear cache on pages holding a reference to this file.
-            $this->getCacheService()->clearCache($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-                'fileInfo' => $this->getMetadataViewHelper()->render($file),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
-    }
-
-    /**
-     * Returns an editing form for moving Files between storage.
-     *
-     * @param array $matches
-     * @throws \Exception
-     */
-    public function editStorageAction(array $matches = [])
-    {
-
-        $this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
-        $this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
-
-        $fieldName = 'storage';
-
-        // Instantiate the Matcher object according different rules.
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        $fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
-
-        $this->view->assign('fieldType', ucfirst($fieldType));
-        $this->view->assign('dataType', $this->dataType);
-        $this->view->assign('matches', $matches);
-        $this->view->assign('fieldNameAndPath', $fieldName);
-        $this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
-        $this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
-    }
-
-    /**
-     * Handle file upload.
-     *
-     * @return \Fab\Media\FileUpload\UploadedFileInterface|array
-     * @throws \InvalidArgumentException
-     */
-    protected function handleUpload()
-    {
-
-        /** @var $uploadManager UploadManager */
-        $uploadManager = GeneralUtility::makeInstance(UploadManager::class);
-
-        try {
-            /** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
-            $result = $uploadManager->handleUpload();
-        } catch (\Exception $e) {
-            $result = array('error' => $e->getMessage());
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return MetadataViewHelper
-     * @throws \InvalidArgumentException
-     */
-    protected function getMetadataViewHelper()
-    {
-        return GeneralUtility::makeInstance(MetadataViewHelper::class);
-    }
-
-    /**
-     * @param File $file
-     * @return ThumbnailService
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @throws \InvalidArgumentException
-     */
-    protected function getThumbnailService(File $file)
-    {
-
-        /** @var $thumbnailService ThumbnailService */
-        $thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
-        $thumbnailService->setAppendTimeStamp(true)
-            ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
-        return $thumbnailService;
-    }
-
-    /**
-     * Get the instance of the Indexer service to update the metadata of the file.
-     *
-     * @param int|ResourceStorage $storage
-     * @return MediaIndexer
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaIndexer($storage)
-    {
-        return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
-    }
-
-    /**
-     * @return CacheService
-     * @throws \InvalidArgumentException
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(CacheService::class);
-    }
-
-    /**
-     * Signal that is emitted before a file is downloaded.
-     *
-     * @param File $file
-     * @return void
-     * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException
-     * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException
-     */
-    protected function emitBeforeDownloadSignal(File $file)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher.
-     *
-     * @return Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return $this->objectManager->get(Dispatcher::class);
-    }
-
-    /**
-     * @return ContentService
-     * @throws \InvalidArgumentException
-     */
-    protected function getContentService()
-    {
-        return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
-    }
-
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @var string
+	 */
+	protected $dataType = 'sys_file';
+
+	/**
+	 * @throws \Fab\Media\Exception\StorageNotOnlineException
+	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
+	 */
+	public function initializeAction()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+
+			/** @var FileConverter $typeConverter */
+			$typeConverter = $this->objectManager->get(FileConverter::class);
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * Force download of the file.
+	 *
+	 * @param File $file
+	 * @param bool $forceDownload
+	 * @return bool|string
+	 * @throws \RuntimeException
+	 */
+	public function downloadAction(File $file, $forceDownload = false)
+	{
+
+		if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
+
+			// Emit signal before downloading the file.
+			$this->emitBeforeDownloadSignal($file);
+
+			// Read the file and dump it with the flag "forceDownload" set to true or false.
+			$file->getStorage()->dumpFileContents($file, $forceDownload);
+
+			$result = true;
+		} else {
+			$result = 'Access denied!';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Handle file upload for a new file.
+	 *
+	 * @param string $combinedIdentifier
+	 * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
+	 * @return string
+	 */
+	public function createAction($combinedIdentifier)
+	{
+		/** @var UploadedFileInterface $uploadedFile */
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
+		}
+
+		// Get the target folder.
+		if ($this->getMediaModule()->hasFolderTree()) {
+			$targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
+		} else {
+			$storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+			$targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
+		}
+
+		try {
+			$conflictMode = DuplicationBehavior::RENAME;
+			$fileName = $uploadedFile->getName();
+			$file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->extractMetadata($file)
+				->applyDefaultCategories($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
+	}
+
+	/**
+	 * Handle file upload for an existing file.
+	 *
+	 * @param File $file
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 * @throws \RuntimeException
+	 */
+	public function updateAction(File $file)
+	{
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
+		}
+
+		/** @var $file File */
+		$targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
+
+		try {
+			$storage = $file->getStorage();
+			$storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->updateIndex($file)
+				->extractMetadata($file);
+
+			// Clear cache on pages holding a reference to this file.
+			$this->getCacheService()->clearCache($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+				'fileInfo' => $this->getMetadataViewHelper()->render($file),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
+	}
+
+	/**
+	 * Returns an editing form for moving Files between storage.
+	 *
+	 * @param array $matches
+	 * @throws \Exception
+	 */
+	public function editStorageAction(array $matches = [])
+	{
+
+		$this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
+		$this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
+
+		$fieldName = 'storage';
+
+		// Instantiate the Matcher object according different rules.
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		$fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
+
+		$this->view->assign('fieldType', ucfirst($fieldType));
+		$this->view->assign('dataType', $this->dataType);
+		$this->view->assign('matches', $matches);
+		$this->view->assign('fieldNameAndPath', $fieldName);
+		$this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
+		$this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
+	}
+
+	/**
+	 * Handle file upload.
+	 *
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface|array
+	 * @throws \InvalidArgumentException
+	 */
+	protected function handleUpload()
+	{
+
+		/** @var $uploadManager UploadManager */
+		$uploadManager = GeneralUtility::makeInstance(UploadManager::class);
+
+		try {
+			/** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
+			$result = $uploadManager->handleUpload();
+		} catch (\Exception $e) {
+			$result = array('error' => $e->getMessage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return MetadataViewHelper
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMetadataViewHelper()
+	{
+		return GeneralUtility::makeInstance(MetadataViewHelper::class);
+	}
+
+	/**
+	 * @param File $file
+	 * @return ThumbnailService
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getThumbnailService(File $file)
+	{
+
+		/** @var $thumbnailService ThumbnailService */
+		$thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
+		$thumbnailService->setAppendTimeStamp(true)
+			->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
+		return $thumbnailService;
+	}
+
+	/**
+	 * Get the instance of the Indexer service to update the metadata of the file.
+	 *
+	 * @param int|ResourceStorage $storage
+	 * @return MediaIndexer
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaIndexer($storage)
+	{
+		return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
+	}
+
+	/**
+	 * @return CacheService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(CacheService::class);
+	}
+
+	/**
+	 * Signal that is emitted before a file is downloaded.
+	 *
+	 * @param File $file
+	 * @return void
+	 * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException
+	 * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException
+	 */
+	protected function emitBeforeDownloadSignal(File $file)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher.
+	 *
+	 * @return Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return $this->objectManager->get(Dispatcher::class);
+	}
+
+	/**
+	 * @return ContentService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getContentService()
+	{
+		return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 
 }