fabarea / media

Classes/ViewHelpers/Form/Select/StorageViewHelper.php

Indentation +40 added lines, -40 removed lines

@@ -20,50 +20,50 @@
 class StorageViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('objects', 'array', '', false, []);
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('objects', 'array', '', false, []);
+	}
 
-    /**
-     * Render a file upload field
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $objects = $this->arguments['objects'];
+	/**
+	 * Render a file upload field
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$objects = $this->arguments['objects'];
 
-        // Check if a storages is selected
-        $currentStorage = $this->getMediaModule()->getCurrentStorage();
+		// Check if a storages is selected
+		$currentStorage = $this->getMediaModule()->getCurrentStorage();
 
-        $template = '<select name="%s[target]">%s</select>';
-        $options = [];
-        foreach ($objects as $storage) {
+		$template = '<select name="%s[target]">%s</select>';
+		$options = [];
+		foreach ($objects as $storage) {
 
-            /** @var \TYPO3\CMS\Core\Resource\ResourceStorage $storage */
-            $options[] = sprintf('<option value="%s" %s>%s %s</option>',
-                $storage->getUid(),
-                is_object($currentStorage) && $currentStorage->getUid() == $storage->getUid() ? 'selected="selected"' : '',
-                $storage->getName(),
-                !$storage->isOnline() ? '(offline)' : ''
-            );
-        }
-        return sprintf($template,
-            VidiModule::getParameterPrefix(),
-            implode("\n", $options)
-        );
-    }
+			/** @var \TYPO3\CMS\Core\Resource\ResourceStorage $storage */
+			$options[] = sprintf('<option value="%s" %s>%s %s</option>',
+				$storage->getUid(),
+				is_object($currentStorage) && $currentStorage->getUid() == $storage->getUid() ? 'selected="selected"' : '',
+				$storage->getName(),
+				!$storage->isOnline() ? '(offline)' : ''
+			);
+		}
+		return sprintf($template,
+			VidiModule::getParameterPrefix(),
+			implode("\n", $options)
+		);
+	}
 
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/ViewHelpers/ImageDimensionViewHelper.php

Indentation +25 added lines, -25 removed lines

@@ -17,31 +17,31 @@
 class ImageDimensionViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * @return void
-     */
-    public function initializeArguments()
-    {
-        $this->registerArgument('preset', 'string', '', true);
-        $this->registerArgument('dimension', 'string', '', false, 'width');
-    }
+	/**
+	 * @return void
+	 */
+	public function initializeArguments()
+	{
+		$this->registerArgument('preset', 'string', '', true);
+		$this->registerArgument('dimension', 'string', '', false, 'width');
+	}
 
-    /**
-     * Returns preset values related to an image dimension
-     *
-     * @return int
-     */
-    public function render()
-    {
-        $preset = $this->arguments['preset'];
-        $dimension = $this->arguments['dimension'];
+	/**
+	 * Returns preset values related to an image dimension
+	 *
+	 * @return int
+	 */
+	public function render()
+	{
+		$preset = $this->arguments['preset'];
+		$dimension = $this->arguments['dimension'];
 
-        $imageDimension = ImagePresetUtility::getInstance()->preset($preset);
-        if ($dimension === 'width') {
-            $result = $imageDimension->getWidth();
-        } else {
-            $result = $imageDimension->getHeight();
-        }
-        return $result;
-    }
+		$imageDimension = ImagePresetUtility::getInstance()->preset($preset);
+		if ($dimension === 'width') {
+			$result = $imageDimension->getWidth();
+		} else {
+			$result = $imageDimension->getHeight();
+		}
+		return $result;
+	}
 }

Classes/Module/VidiModule.php

Indentation +29 added lines, -29 removed lines

@@ -16,33 +16,33 @@
 class VidiModule
 {
 
-    const SIGNATURE = 'file_VidiSysFileM1';
-    const PARAMETER_PREFIX = 'tx_vidi_file_vidisysfilem1';
-
-    const SIGNATURE_FOLDER_TREE_OMITTED = 'content_VidiSysFileM1';
-    const PARAMETER_PREFIX_FOLDER_TREE_OMITTED = 'tx_vidi_content_vidisysfilem1';
-
-    /**
-     * @return string
-     */
-    static public function getSignature()
-    {
-        return self::getMediaModule()->hasFolderTree() ? self::SIGNATURE : self::SIGNATURE_FOLDER_TREE_OMITTED;
-    }
-
-    /**
-     * @return string
-     */
-    static public function getParameterPrefix()
-    {
-        return self::getMediaModule()->hasFolderTree() ? self::PARAMETER_PREFIX : self::PARAMETER_PREFIX_FOLDER_TREE_OMITTED;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    static protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+	const SIGNATURE = 'file_VidiSysFileM1';
+	const PARAMETER_PREFIX = 'tx_vidi_file_vidisysfilem1';
+
+	const SIGNATURE_FOLDER_TREE_OMITTED = 'content_VidiSysFileM1';
+	const PARAMETER_PREFIX_FOLDER_TREE_OMITTED = 'tx_vidi_content_vidisysfilem1';
+
+	/**
+	 * @return string
+	 */
+	static public function getSignature()
+	{
+		return self::getMediaModule()->hasFolderTree() ? self::SIGNATURE : self::SIGNATURE_FOLDER_TREE_OMITTED;
+	}
+
+	/**
+	 * @return string
+	 */
+	static public function getParameterPrefix()
+	{
+		return self::getMediaModule()->hasFolderTree() ? self::PARAMETER_PREFIX : self::PARAMETER_PREFIX_FOLDER_TREE_OMITTED;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	static protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 }
\ No newline at end of file

Classes/Backend/TceForms.php

Indentation +31 added lines, -31 removed lines

@@ -20,36 +20,36 @@
 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('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('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/FileUpload/UploadManager.php

Indentation +357 added lines, -357 removed lines

@@ -20,362 +20,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 = PATH_site . 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 = PATH_site . 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/Optimizer/Resize.php

Indentation +113 added lines, -113 removed lines

@@ -18,118 +18,118 @@
 class Resize implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * @var \TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    protected $storage;
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return Resize
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->init();
-        $this->gifCreator->absPrefix = PATH_site;
-    }
-
-    /**
-     * Optimize the given uploaded image.
-     *
-     * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-
-        $imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
-
-        $currentWidth = $imageInfo[0];
-        $currentHeight = $imageInfo[1];
-
-        // resize an image if this one is bigger than telling by the settings.
-        if (is_object($this->storage)) {
-            $storageRecord = $this->storage->getStorageRecord();
-        } else {
-            // Will only work in the BE for now.
-            $storage = $this->getMediaModule()->getCurrentStorage();
-            $storageRecord = $storage->getStorageRecord();
-        }
-
-        if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
-
-            /** @var \Fab\Media\Dimension $imageDimension */
-            $imageDimension = GeneralUtility::makeInstance(\Fab\Media\Dimension::class, $storageRecord['maximum_dimension_original_image']);
-            if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
-
-                // resize taking the width as reference
-                $this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
-            }
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Resize an image according to given parameter.
-     *
-     * @throws \Exception
-     * @param string $fileNameAndPath
-     * @param int $width
-     * @param int $height
-     * @return void
-     */
-    public function resize($fileNameAndPath, $width = 0, $height = 0)
-    {
-
-        // Skip profile of the image
-        $imParams = '###SkipStripProfile###';
-        $options = array(
-            'maxW' => $width,
-            'maxH' => $height,
-        );
-
-        $tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
-        if ($tempFileInfo) {
-
-            // Overwrite original file
-            @unlink($fileNameAndPath);
-            @rename($tempFileInfo[3], $fileNameAndPath);
-        }
-    }
-
-    /**
-     * Escapes a file name so it can safely be used on the command line.
-     *
-     * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
-     * @param string $inputName filename to safeguard, must not be empty
-     * @return string $inputName escaped as needed
-     */
-    protected function wrapFileName($inputName)
-    {
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            $currentLocale = setlocale(LC_CTYPE, 0);
-            setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
-        }
-        $escapedInputName = escapeshellarg($inputName);
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            setlocale(LC_CTYPE, $currentLocale);
-        }
-        return $escapedInputName;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+	/**
+	 * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
+	 */
+	protected $gifCreator;
+
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	protected $storage;
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return Resize
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->init();
+		$this->gifCreator->absPrefix = PATH_site;
+	}
+
+	/**
+	 * Optimize the given uploaded image.
+	 *
+	 * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+
+		$imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
+
+		$currentWidth = $imageInfo[0];
+		$currentHeight = $imageInfo[1];
+
+		// resize an image if this one is bigger than telling by the settings.
+		if (is_object($this->storage)) {
+			$storageRecord = $this->storage->getStorageRecord();
+		} else {
+			// Will only work in the BE for now.
+			$storage = $this->getMediaModule()->getCurrentStorage();
+			$storageRecord = $storage->getStorageRecord();
+		}
+
+		if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
+
+			/** @var \Fab\Media\Dimension $imageDimension */
+			$imageDimension = GeneralUtility::makeInstance(\Fab\Media\Dimension::class, $storageRecord['maximum_dimension_original_image']);
+			if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
+
+				// resize taking the width as reference
+				$this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
+			}
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Resize an image according to given parameter.
+	 *
+	 * @throws \Exception
+	 * @param string $fileNameAndPath
+	 * @param int $width
+	 * @param int $height
+	 * @return void
+	 */
+	public function resize($fileNameAndPath, $width = 0, $height = 0)
+	{
+
+		// Skip profile of the image
+		$imParams = '###SkipStripProfile###';
+		$options = array(
+			'maxW' => $width,
+			'maxH' => $height,
+		);
+
+		$tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
+		if ($tempFileInfo) {
+
+			// Overwrite original file
+			@unlink($fileNameAndPath);
+			@rename($tempFileInfo[3], $fileNameAndPath);
+		}
+	}
+
+	/**
+	 * Escapes a file name so it can safely be used on the command line.
+	 *
+	 * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
+	 * @param string $inputName filename to safeguard, must not be empty
+	 * @return string $inputName escaped as needed
+	 */
+	protected function wrapFileName($inputName)
+	{
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			$currentLocale = setlocale(LC_CTYPE, 0);
+			setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
+		}
+		$escapedInputName = escapeshellarg($inputName);
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			setlocale(LC_CTYPE, $currentLocale);
+		}
+		return $escapedInputName;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/FileUpload/Optimizer/Rotate.php

Indentation +149 added lines, -149 removed lines

@@ -17,154 +17,154 @@
 class Rotate implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * @return \Fab\Media\FileUpload\Optimizer\Rotate
-     */
-    public function __construct()
-    {
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->init();
-        $this->gifCreator->absPrefix = PATH_site;
-    }
-
-    /**
-     * Optimize the given uploaded image
-     *
-     * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-
-        $orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
-        $isRotated = $this->isRotated($orientation);
-
-        // Only rotate image if necessary!
-        if ($isRotated > 0) {
-            $transformation = $this->getTransformation($orientation);
-
-            $imParams = '###SkipStripProfile###';
-            if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
-            }
-
-            $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
-            if ($tempFileInfo) {
-                // Replace original file
-                @unlink($uploadedFile->getFileWithAbsolutePath());
-                @rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
-
-                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
-                    $this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
-                }
-            }
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Returns the EXIF orientation of a given picture.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    protected function getOrientation($filename)
-    {
-        $extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
-        $orientation = 1; // Fallback to "straight"
-        if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
-            try {
-                $exif = exif_read_data($filename);
-                if ($exif) {
-                    $orientation = $exif['Orientation'];
-                }
-            } catch (\Exception $e) {}
-        }
-        return $orientation;
-    }
-
-    /**
-     * Returns true if the given picture is rotated.
-     *
-     * @param integer $orientation EXIF orientation
-     * @return integer
-     * @see http://www.impulseadventure.com/photo/exif-orientation.html
-     */
-    protected function isRotated($orientation)
-    {
-        $ret = false;
-        switch ($orientation) {
-            case 2: // horizontal flip
-            case 3: // 180°
-            case 4: // vertical flip
-            case 5: // vertical flip + 90 rotate right
-            case 6: // 90° rotate right
-            case 7: // horizontal flip + 90 rotate right
-            case 8: // 90° rotate left
-                $ret = true;
-                break;
-        }
-        return $ret;
-    }
-
-    /**
-     * Returns a command line parameter to fix the orientation of a rotated picture.
-     *
-     * @param integer $orientation
-     * @return string
-     */
-    protected function getTransformation($orientation)
-    {
-        $transformation = '';
-        if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
-            // ImageMagick
-            if ($orientation >= 2 && $orientation <= 8) {
-                $transformation = '-auto-orient';
-            }
-        } else {
-            // GraphicsMagick
-            switch ($orientation) {
-                case 2: // horizontal flip
-                    $transformation = '-flip horizontal';
-                    break;
-                case 3: // 180°
-                    $transformation = '-rotate 180';
-                    break;
-                case 4: // vertical flip
-                    $transformation = '-flip vertical';
-                    break;
-                case 5: // vertical flip + 90 rotate right
-                    $transformation = '-transpose';
-                    break;
-                case 6: // 90° rotate right
-                    $transformation = '-rotate 90';
-                    break;
-                case 7: // horizontal flip + 90 rotate right
-                    $transformation = '-transverse';
-                    break;
-                case 8: // 90° rotate left
-                    $transformation = '-rotate 270';
-                    break;
-            }
-        }
-        return $transformation;
-    }
-
-    /**
-     * Resets the EXIF orientation flag of a picture.
-     *
-     * @param string $filename
-     * @return void
-     * @see http://sylvana.net/jpegcrop/exif_orientation.html
-     */
-    protected function resetOrientation($filename)
-    {
-        JpegExifOrient::setOrientation($filename, 1);
-    }
+	/**
+	 * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
+	 */
+	protected $gifCreator;
+
+	/**
+	 * @return \Fab\Media\FileUpload\Optimizer\Rotate
+	 */
+	public function __construct()
+	{
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->init();
+		$this->gifCreator->absPrefix = PATH_site;
+	}
+
+	/**
+	 * Optimize the given uploaded image
+	 *
+	 * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+
+		$orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
+		$isRotated = $this->isRotated($orientation);
+
+		// Only rotate image if necessary!
+		if ($isRotated > 0) {
+			$transformation = $this->getTransformation($orientation);
+
+			$imParams = '###SkipStripProfile###';
+			if ($transformation !== '') {
+				$imParams .= ' ' . $transformation;
+			}
+
+			$tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
+			if ($tempFileInfo) {
+				// Replace original file
+				@unlink($uploadedFile->getFileWithAbsolutePath());
+				@rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
+
+				if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
+					$this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
+				}
+			}
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Returns the EXIF orientation of a given picture.
+	 *
+	 * @param string $filename
+	 * @return integer
+	 */
+	protected function getOrientation($filename)
+	{
+		$extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
+		$orientation = 1; // Fallback to "straight"
+		if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
+			try {
+				$exif = exif_read_data($filename);
+				if ($exif) {
+					$orientation = $exif['Orientation'];
+				}
+			} catch (\Exception $e) {}
+		}
+		return $orientation;
+	}
+
+	/**
+	 * Returns true if the given picture is rotated.
+	 *
+	 * @param integer $orientation EXIF orientation
+	 * @return integer
+	 * @see http://www.impulseadventure.com/photo/exif-orientation.html
+	 */
+	protected function isRotated($orientation)
+	{
+		$ret = false;
+		switch ($orientation) {
+			case 2: // horizontal flip
+			case 3: // 180°
+			case 4: // vertical flip
+			case 5: // vertical flip + 90 rotate right
+			case 6: // 90° rotate right
+			case 7: // horizontal flip + 90 rotate right
+			case 8: // 90° rotate left
+				$ret = true;
+				break;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Returns a command line parameter to fix the orientation of a rotated picture.
+	 *
+	 * @param integer $orientation
+	 * @return string
+	 */
+	protected function getTransformation($orientation)
+	{
+		$transformation = '';
+		if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
+			// ImageMagick
+			if ($orientation >= 2 && $orientation <= 8) {
+				$transformation = '-auto-orient';
+			}
+		} else {
+			// GraphicsMagick
+			switch ($orientation) {
+				case 2: // horizontal flip
+					$transformation = '-flip horizontal';
+					break;
+				case 3: // 180°
+					$transformation = '-rotate 180';
+					break;
+				case 4: // vertical flip
+					$transformation = '-flip vertical';
+					break;
+				case 5: // vertical flip + 90 rotate right
+					$transformation = '-transpose';
+					break;
+				case 6: // 90° rotate right
+					$transformation = '-rotate 90';
+					break;
+				case 7: // horizontal flip + 90 rotate right
+					$transformation = '-transverse';
+					break;
+				case 8: // 90° rotate left
+					$transformation = '-rotate 270';
+					break;
+			}
+		}
+		return $transformation;
+	}
+
+	/**
+	 * Resets the EXIF orientation flag of a picture.
+	 *
+	 * @param string $filename
+	 * @return void
+	 * @see http://sylvana.net/jpegcrop/exif_orientation.html
+	 */
+	protected function resetOrientation($filename)
+	{
+		JpegExifOrient::setOrientation($filename, 1);
+	}
 
 }

Classes/FileUpload/FormUtility.php

Indentation +45 added lines, -45 removed lines

@@ -16,54 +16,54 @@
 class FormUtility implements SingletonInterface
 {
 
-    /**
-     * Returns a class instance.
-     *
-     * @return \Fab\Media\FileUpload\FormUtility|object
-     */
-    static public function getInstance()
-    {
-        return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\FileUpload\FormUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return \Fab\Media\FileUpload\FormUtility|object
+	 */
+	static public function getInstance()
+	{
+		return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\FileUpload\FormUtility::class);
+	}
 
-    /**
-     * Tells whether the content type is valid.
-     *
-     * @return bool
-     */
-    public function hasValidContentType()
-    {
-        return isset($GLOBALS['_SERVER']['CONTENT_TYPE']);
-    }
+	/**
+	 * Tells whether the content type is valid.
+	 *
+	 * @return bool
+	 */
+	public function hasValidContentType()
+	{
+		return isset($GLOBALS['_SERVER']['CONTENT_TYPE']);
+	}
 
-    /**
-     * Tells whether the form is multiparted, e.g "multipart/form-data"
-     *
-     * @return bool
-     */
-    public function isMultiparted()
-    {
-        return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'multipart/form-data') === 0;
-    }
+	/**
+	 * Tells whether the form is multiparted, e.g "multipart/form-data"
+	 *
+	 * @return bool
+	 */
+	public function isMultiparted()
+	{
+		return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'multipart/form-data') === 0;
+	}
 
-    /**
-     * Tells whether the form is URL encoded, e.g "application/x-www-form-urlencoded; charset=UTF-8"
-     *
-     * @return bool
-     */
-    public function isUrlEncoded()
-    {
-        return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/x-www-form-urlencoded') === 0;
-    }
+	/**
+	 * Tells whether the form is URL encoded, e.g "application/x-www-form-urlencoded; charset=UTF-8"
+	 *
+	 * @return bool
+	 */
+	public function isUrlEncoded()
+	{
+		return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/x-www-form-urlencoded') === 0;
+	}
 
-    /**
-     * Tells whether the form is octet streamed, e.g "application/x-www-form-urlencoded; charset=UTF-8"
-     *
-     * @return bool
-     */
-    public function isOctetStreamed()
-    {
-        return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/octet-stream') === 0;
-    }
+	/**
+	 * Tells whether the form is octet streamed, e.g "application/x-www-form-urlencoded; charset=UTF-8"
+	 *
+	 * @return bool
+	 */
+	public function isOctetStreamed()
+	{
+		return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/octet-stream') === 0;
+	}
 
 }

Classes/Tool/CacheWarmUpTool.php

Indentation +59 added lines, -59 removed lines

@@ -16,73 +16,73 @@
 class CacheWarmUpTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Cache warm up';
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Cache warm up';
+	}
 
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', PATH_site);
-        return $view->render();
-    }
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', PATH_site);
+		return $view->render();
+	}
 
-    /**
-     * Do the job: warm up the cache.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
+	/**
+	 * Do the job: warm up the cache.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
 
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
 
-        $numberOfEntries = $this->getCacheService()->warmUp();
-        $view->assign('numberOfEntries', $numberOfEntries);
-        touch($this->getWarmUpSemaphorFile());
+		$numberOfEntries = $this->getCacheService()->warmUp();
+		$view->assign('numberOfEntries', $numberOfEntries);
+		touch($this->getWarmUpSemaphorFile());
 
-        return $view->render();
-    }
+		return $view->render();
+	}
 
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 
-    /**
-     * @return string
-     */
-    protected function getWarmUpSemaphorFile()
-    {
-        return PATH_site . 'typo3temp/.media_cache_warmed_up';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getWarmUpSemaphorFile()
+	{
+		return PATH_site . 'typo3temp/.media_cache_warmed_up';
+	}
 
-    /**
-     * @return \Fab\Media\Cache\CacheService|object
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
-    }
+	/**
+	 * @return \Fab\Media\Cache\CacheService|object
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
+	}
 
 }