fabarea / media

Classes/Dimension.php

Indentation +35 added lines, -35 removed lines

@@ -16,39 +16,39 @@
  */
 class Dimension
 {
-    /**
-     * @var int
-     */
-    protected $width = 0;
-
-    /**
-     * @var int
-     */
-    protected $height = 0;
-
-    /**
-     * @param string $dimension
-     */
-    public function __construct($dimension)
-    {
-        $dimensions = GeneralUtility::trimExplode('x', $dimension);
-        $this->width = empty($dimensions[0]) ? 0 : $dimensions[0];
-        $this->height = empty($dimensions[1]) ? 0 : $dimensions[1];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getWidth()
-    {
-        return $this->width;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->height;
-    }
+	/**
+	 * @var int
+	 */
+	protected $width = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $height = 0;
+
+	/**
+	 * @param string $dimension
+	 */
+	public function __construct($dimension)
+	{
+		$dimensions = GeneralUtility::trimExplode('x', $dimension);
+		$this->width = empty($dimensions[0]) ? 0 : $dimensions[0];
+		$this->height = empty($dimensions[1]) ? 0 : $dimensions[1];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getWidth()
+	{
+		return $this->width;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		return $this->height;
+	}
 }

Classes/FileUpload/FormUtility.php

Indentation +45 added lines, -45 removed lines

@@ -16,53 +16,53 @@
  */
 class FormUtility implements SingletonInterface
 {
-    /**
-     * Returns a class instance.
-     *
-     * @return \Fab\Media\FileUpload\FormUtility|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\FileUpload\FormUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return \Fab\Media\FileUpload\FormUtility|object
+	 */
+	public static function getInstance()
+	{
+		return 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/FileUpload/UploadedFileAbstract.php

Indentation +137 added lines, -137 removed lines

@@ -18,141 +18,141 @@
  */
 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/FileUpload/UploadManager.php

Indentation +354 added lines, -354 removed lines

@@ -24,358 +24,358 @@
  */
 class UploadManager
 {
-    public const UPLOAD_FOLDER = 'typo3temp/pics';
-
-    /**
-     * @var int|null|string
-     */
-    protected $sizeLimit;
-
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var FormUtility
-     */
-    protected $formUtility;
-
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage;
-
-    /**
-     * Name of the file input in the DOM.
-     *
-     * @var string
-     */
-    protected $inputName = 'qqfile';
-
-    /**
-     * @param ResourceStorage $storage
-     * @return UploadManager
-     */
-    public 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(MultipartedFile::class);
-        } elseif ($this->formUtility->isOctetStreamed()) {
-            // Fine Upload plugin would use it if forceEncoded = false and paramsInBody = false
-            $uploadedFile = GeneralUtility::makeInstance(StreamedFile::class);
-        } elseif ($this->formUtility->isUrlEncoded()) {
-            // Used for image resizing in BE
-            $uploadedFile = GeneralUtility::makeInstance(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() == 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;
-                // no break
-            case 'm':
-                $val *= 1024;
-                // no break
-            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::makeInstance(FileNameValidator::class)->isValid($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'] = StringUtility::uniqueList(strtolower($fileExtensionPermissions['allow']));
-            $fileExtensionPermissions['deny'] = StringUtility::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 ResourceStorage
-     */
-    public function getStorage()
-    {
-        return $this->storage;
-    }
-
-    /**
-     * @param ResourceStorage $storage
-     * @return $this
-     */
-    public function setStorage($storage)
-    {
-        $this->storage = $storage;
-        return $this;
-    }
+	public const UPLOAD_FOLDER = 'typo3temp/pics';
+
+	/**
+	 * @var int|null|string
+	 */
+	protected $sizeLimit;
+
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var FormUtility
+	 */
+	protected $formUtility;
+
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage;
+
+	/**
+	 * Name of the file input in the DOM.
+	 *
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
+
+	/**
+	 * @param ResourceStorage $storage
+	 * @return UploadManager
+	 */
+	public 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(MultipartedFile::class);
+		} elseif ($this->formUtility->isOctetStreamed()) {
+			// Fine Upload plugin would use it if forceEncoded = false and paramsInBody = false
+			$uploadedFile = GeneralUtility::makeInstance(StreamedFile::class);
+		} elseif ($this->formUtility->isUrlEncoded()) {
+			// Used for image resizing in BE
+			$uploadedFile = GeneralUtility::makeInstance(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() == 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;
+				// no break
+			case 'm':
+				$val *= 1024;
+				// no break
+			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::makeInstance(FileNameValidator::class)->isValid($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'] = StringUtility::uniqueList(strtolower($fileExtensionPermissions['allow']));
+			$fileExtensionPermissions['deny'] = StringUtility::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 ResourceStorage
+	 */
+	public function getStorage()
+	{
+		return $this->storage;
+	}
+
+	/**
+	 * @param ResourceStorage $storage
+	 * @return $this
+	 */
+	public function setStorage($storage)
+	{
+		$this->storage = $storage;
+		return $this;
+	}
 }

Classes/FileUpload/ImageOptimizerInterface.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
  */
 interface ImageOptimizerInterface
 {
-    /**
-     * Optimize the given uploaded image
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     */
-    public function optimize($uploadedFile);
+	/**
+	 * Optimize the given uploaded image
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 */
+	public function optimize($uploadedFile);
 }

Classes/FileUpload/StreamedFile.php

Indentation +78 added lines, -78 removed lines

@@ -18,93 +18,93 @@
  */
 class StreamedFile extends UploadedFileAbstract
 {
-    /**
-     * @var string
-     */
-    protected $inputName = 'qqfile';
+	/**
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
 
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
 
-    /**
-     * @var string
-     */
-    protected $name;
+	/**
+	 * @var string
+	 */
+	protected $name;
 
-    /**
-     * Save the file to the specified path
-     *
-     * @throws EmptyPropertyException
-     * @return boolean true on success
-     */
-    public function save()
-    {
-        if (is_null($this->uploadFolder)) {
-            throw new EmptyPropertyException('Upload folder is not defined', 1361787579);
-        }
+	/**
+	 * Save the file to the specified path
+	 *
+	 * @throws EmptyPropertyException
+	 * @return boolean true on success
+	 */
+	public function save()
+	{
+		if (is_null($this->uploadFolder)) {
+			throw new EmptyPropertyException('Upload folder is not defined', 1361787579);
+		}
 
-        if (is_null($this->name)) {
-            throw new EmptyPropertyException('File name is not defined', 1361787580);
-        }
+		if (is_null($this->name)) {
+			throw new EmptyPropertyException('File name is not defined', 1361787580);
+		}
 
-        $input = fopen("php://input", "r");
-        $temp = tmpfile();
-        $realSize = stream_copy_to_stream($input, $temp);
-        fclose($input);
+		$input = fopen("php://input", "r");
+		$temp = tmpfile();
+		$realSize = stream_copy_to_stream($input, $temp);
+		fclose($input);
 
-        if ($realSize != $this->getSize()) {
-            return false;
-        }
+		if ($realSize != $this->getSize()) {
+			return false;
+		}
 
-        $target = fopen($this->getFileWithAbsolutePath(), "w");
-        fseek($temp, 0, SEEK_SET);
-        stream_copy_to_stream($temp, $target);
-        fclose($target);
+		$target = fopen($this->getFileWithAbsolutePath(), "w");
+		fseek($temp, 0, SEEK_SET);
+		stream_copy_to_stream($temp, $target);
+		fclose($target);
 
-        return true;
-    }
+		return true;
+	}
 
-    /**
-     * Get the original file name.
-     *
-     * @return string
-     */
-    public function getOriginalName()
-    {
-        return $_GET[$this->inputName];
-    }
+	/**
+	 * Get the original file name.
+	 *
+	 * @return string
+	 */
+	public function getOriginalName()
+	{
+		return $_GET[$this->inputName];
+	}
 
-    /**
-     * Get the file size
-     *
-     * @throws \Exception
-     * @return integer file-size in byte
-     */
-    public function getSize()
-    {
-        if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
-            return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
-        } else {
-            throw new \Exception('Getting content length is not supported.');
-        }
-    }
+	/**
+	 * Get the file size
+	 *
+	 * @throws \Exception
+	 * @return integer file-size in byte
+	 */
+	public function getSize()
+	{
+		if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
+			return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
+		} else {
+			throw new \Exception('Getting content length is not supported.');
+		}
+	}
 
-    /**
-     * Get MIME type of file.
-     *
-     * @return string|boolean MIME type. eg, text/html, false on error
-     */
-    public function getMimeType()
-    {
-        $this->checkFileExistence();
-        if (function_exists('finfo_file')) {
-            $fileInfo = new \finfo();
-            return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
-        } elseif (function_exists('mime_content_type')) {
-            return mime_content_type($this->getFileWithAbsolutePath());
-        }
-        return false;
-    }
+	/**
+	 * Get MIME type of file.
+	 *
+	 * @return string|boolean MIME type. eg, text/html, false on error
+	 */
+	public function getMimeType()
+	{
+		$this->checkFileExistence();
+		if (function_exists('finfo_file')) {
+			$fileInfo = new \finfo();
+			return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
+		} elseif (function_exists('mime_content_type')) {
+			return mime_content_type($this->getFileWithAbsolutePath());
+		}
+		return false;
+	}
 }

Classes/FileUpload/ImageOptimizer.php

Indentation +70 added lines, -70 removed lines

@@ -17,81 +17,81 @@
  */
 class ImageOptimizer implements SingletonInterface
 {
-    /**
-     * @var array
-     */
-    protected $optimizers = [];
+	/**
+	 * @var array
+	 */
+	protected $optimizers = [];
 
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage;
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage;
 
-    /**
-     * Returns a class instance.
-     *
-     * @return ImageOptimizer
-     * @throws \InvalidArgumentException
-     * @param ResourceStorage $storage
-     */
-    public static function getInstance($storage = null)
-    {
-        return GeneralUtility::makeInstance(self::class, $storage);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return ImageOptimizer
+	 * @throws \InvalidArgumentException
+	 * @param ResourceStorage $storage
+	 */
+	public static function getInstance($storage = null)
+	{
+		return GeneralUtility::makeInstance(self::class, $storage);
+	}
 
-    /**
-     * Constructor
-     *
-     * @return ImageOptimizer
-     * @param ResourceStorage $storage
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->add('Fab\Media\FileUpload\Optimizer\Resize');
-        $this->add('Fab\Media\FileUpload\Optimizer\Rotate');
-    }
+	/**
+	 * Constructor
+	 *
+	 * @return ImageOptimizer
+	 * @param ResourceStorage $storage
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->add('Fab\Media\FileUpload\Optimizer\Resize');
+		$this->add('Fab\Media\FileUpload\Optimizer\Rotate');
+	}
 
-    /**
-     * Register a new optimizer
-     *
-     * @param string $className
-     * @return void
-     */
-    public function add($className)
-    {
-        $this->optimizers[] = $className;
-    }
+	/**
+	 * Register a new optimizer
+	 *
+	 * @param string $className
+	 * @return void
+	 */
+	public function add($className)
+	{
+		$this->optimizers[] = $className;
+	}
 
-    /**
-     * Un-register a new optimizer
-     *
-     * @param string $className
-     * @return void
-     */
-    public function remove($className)
-    {
-        if (in_array($className, $this->optimizers)) {
-            $key = array_search($className, $this->optimizers);
-            unset($this->optimizers[$key]);
-        }
-    }
+	/**
+	 * Un-register a new optimizer
+	 *
+	 * @param string $className
+	 * @return void
+	 */
+	public function remove($className)
+	{
+		if (in_array($className, $this->optimizers)) {
+			$key = array_search($className, $this->optimizers);
+			unset($this->optimizers[$key]);
+		}
+	}
 
-    /**
-     * Optimize an image
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     * @throws \InvalidArgumentException
-     */
-    public function optimize(UploadedFileInterface $uploadedFile)
-    {
-        foreach ($this->optimizers as $optimizer) {
-            /** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
-            $optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
-            $uploadedFile = $optimizer->optimize($uploadedFile);
-        }
+	/**
+	 * Optimize an image
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 * @throws \InvalidArgumentException
+	 */
+	public function optimize(UploadedFileInterface $uploadedFile)
+	{
+		foreach ($this->optimizers as $optimizer) {
+			/** @var $optimizer \Fab\Media\FileUpload\ImageOptimizerInterface */
+			$optimizer = GeneralUtility::makeInstance($optimizer, $this->storage);
+			$uploadedFile = $optimizer->optimize($uploadedFile);
+		}
 
-        return $uploadedFile;
-    }
+		return $uploadedFile;
+	}
 }

Classes/FileUpload/Base64File.php

Indentation +111 added lines, -111 removed lines

@@ -16,115 +16,115 @@
  */
 class Base64File extends UploadedFileAbstract
 {
-    /**
-     * @var string
-     */
-    protected $inputName = 'qqfile';
-
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $image;
-
-    /**
-     * @var string
-     */
-    protected $extension;
-
-    /**
-     * @return \Fab\Media\FileUpload\Base64File
-     */
-    public function __construct()
-    {
-        // Processes the encoded image data and returns the decoded image
-        $encodedImage = GeneralUtility::_POST($this->inputName);
-        if (preg_match('/^data:image\/(jpg|jpeg|png)/i', $encodedImage, $matches)) {
-            $this->extension = $matches[1];
-        } else {
-            return false;
-        }
-
-        // Remove the mime-type header
-        $data = reset(array_reverse(explode('base64,', $encodedImage)));
-
-        // Use strict mode to prevent characters from outside the base64 range
-        $this->image = base64_decode($data, true);
-
-        if (!$this->image) {
-            return false;
-        }
-
-        $this->setName(uniqid() . '.' . $this->extension);
-    }
-
-    /**
-     * Save the file to the specified path
-     *
-     * @throws EmptyPropertyException
-     * @return boolean true on success
-     */
-    public function save()
-    {
-        if (is_null($this->uploadFolder)) {
-            throw new EmptyPropertyException('Upload folder is not defined', 1362587741);
-        }
-
-        if (is_null($this->name)) {
-            throw new EmptyPropertyException('File name is not defined', 1362587742);
-        }
-
-        return file_put_contents($this->getFileWithAbsolutePath(), $this->image) > 0;
-    }
-
-    /**
-     * Get the original file name.
-     *
-     * @return string
-     */
-    public function getOriginalName()
-    {
-        return $this->getName();
-    }
-
-    /**
-     * Get the file size
-     *
-     * @throws \Exception
-     * @return integer file-size in byte
-     */
-    public function getSize()
-    {
-        if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
-            return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
-        } else {
-            throw new \Exception('Getting content length is not supported.');
-        }
-    }
-
-    /**
-     * Get MIME type of file.
-     *
-     * @return string|boolean MIME type. eg, text/html, false on error
-     */
-    public function getMimeType()
-    {
-        $this->checkFileExistence();
-        if (function_exists('finfo_file')) {
-            $fileInfo = new \finfo();
-            return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
-        } elseif (function_exists('mime_content_type')) {
-            return mime_content_type($this->getFileWithAbsolutePath());
-        }
-        return false;
-    }
+	/**
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
+
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * @var string
+	 */
+	protected $image;
+
+	/**
+	 * @var string
+	 */
+	protected $extension;
+
+	/**
+	 * @return \Fab\Media\FileUpload\Base64File
+	 */
+	public function __construct()
+	{
+		// Processes the encoded image data and returns the decoded image
+		$encodedImage = GeneralUtility::_POST($this->inputName);
+		if (preg_match('/^data:image\/(jpg|jpeg|png)/i', $encodedImage, $matches)) {
+			$this->extension = $matches[1];
+		} else {
+			return false;
+		}
+
+		// Remove the mime-type header
+		$data = reset(array_reverse(explode('base64,', $encodedImage)));
+
+		// Use strict mode to prevent characters from outside the base64 range
+		$this->image = base64_decode($data, true);
+
+		if (!$this->image) {
+			return false;
+		}
+
+		$this->setName(uniqid() . '.' . $this->extension);
+	}
+
+	/**
+	 * Save the file to the specified path
+	 *
+	 * @throws EmptyPropertyException
+	 * @return boolean true on success
+	 */
+	public function save()
+	{
+		if (is_null($this->uploadFolder)) {
+			throw new EmptyPropertyException('Upload folder is not defined', 1362587741);
+		}
+
+		if (is_null($this->name)) {
+			throw new EmptyPropertyException('File name is not defined', 1362587742);
+		}
+
+		return file_put_contents($this->getFileWithAbsolutePath(), $this->image) > 0;
+	}
+
+	/**
+	 * Get the original file name.
+	 *
+	 * @return string
+	 */
+	public function getOriginalName()
+	{
+		return $this->getName();
+	}
+
+	/**
+	 * Get the file size
+	 *
+	 * @throws \Exception
+	 * @return integer file-size in byte
+	 */
+	public function getSize()
+	{
+		if (isset($GLOBALS['_SERVER']['CONTENT_LENGTH'])) {
+			return (int)$GLOBALS['_SERVER']['CONTENT_LENGTH'];
+		} else {
+			throw new \Exception('Getting content length is not supported.');
+		}
+	}
+
+	/**
+	 * Get MIME type of file.
+	 *
+	 * @return string|boolean MIME type. eg, text/html, false on error
+	 */
+	public function getMimeType()
+	{
+		$this->checkFileExistence();
+		if (function_exists('finfo_file')) {
+			$fileInfo = new \finfo();
+			return $fileInfo->file($this->getFileWithAbsolutePath(), FILEINFO_MIME_TYPE);
+		} elseif (function_exists('mime_content_type')) {
+			return mime_content_type($this->getFileWithAbsolutePath());
+		}
+		return false;
+	}
 }

Classes/FileUpload/Optimizer/Resize.php

Indentation +96 added lines, -96 removed lines

@@ -22,110 +22,110 @@
  */
 class Resize implements ImageOptimizerInterface
 {
-    /**
-     * @var GifBuilder
-     */
-    protected $gifCreator;
+	/**
+	 * @var GifBuilder
+	 */
+	protected $gifCreator;
 
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage;
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage;
 
-    /**
-     * Constructor
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
 
-    /**
-     * Optimize the given uploaded image.
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-        $imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
+	/**
+	 * Optimize the given uploaded image.
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+		$imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
 
-        $currentWidth = $imageInfo[0];
-        $currentHeight = $imageInfo[1];
+		$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();
-        }
+		// 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 Dimension $imageDimension */
-            $imageDimension = GeneralUtility::makeInstance(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;
-    }
+		if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
+			/** @var Dimension $imageDimension */
+			$imageDimension = GeneralUtility::makeInstance(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,
-        );
+	/**
+	 * 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);
-        }
-    }
+		$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;
-    }
+	/**
+	 * 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(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $this->storage = $storage;
         $this->gifCreator = GeneralUtility::makeInstance(GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+        $this->gifCreator->absPrefix = Environment::getPublicPath().'/';
     }
 
     /**