fabarea / media

Classes/Cache/CacheService.php

Doc Comments +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
     /**
      * Returns whether the current mode is Frontend
      *
-     * @return string
+     * @return boolean
      */
     protected function isFrontendMode()
     {

Indentation +241 added lines, -241 removed lines

@@ -22,245 +22,245 @@
 class CacheService
 {
 
-    /**
-     * Traverse all files and initialize cache values.
-     *
-     * @return int
-     */
-    public function warmUp()
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $rows = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where('storage > 0')
-            ->execute()
-            ->fetchAll();
-
-        $counter = 0;
-        foreach ($rows as $row) {
-
-            $fileIdentifier = $row['uid'];
-            $totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
-
-            $values = array(
-                'number_of_references' => $totalNumberOfReferences
-            );
-
-            $this->getDataService()->update(
-                'sys_file',
-                $values,
-                [
-                    'uid' => $fileIdentifier
-                ]
-            );
-            $counter++;
-        }
-
-        return $counter;
-    }
-
-    /**
-     * Clear all possible cache related to a file.
-     * This method is useful when replacing a file for instance.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function clearCache(File $file)
-    {
-
-        $this->clearCachePages($file);
-        $this->flushProcessedFiles($file);
-    }
-
-    /**
-     * Remove all processed files that belong to the given File object.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function flushProcessedFiles(File $file)
-    {
-
-        /** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
-        foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
-            if ($processedFile->exists()) {
-                $processedFile->delete(true);
-            }
-
-            $this->getDataService()->delete(
-                'sys_file_processedfile',
-                [
-                    'uid' => (int)$processedFile->getUid()
-                ]
-            );
-        }
-    }
-
-    /**
-     * Return a processed file repository
-     *
-     * @return \TYPO3\CMS\Core\Resource\ProcessedFileRepository|object
-     */
-    protected function getProcessedFileRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ProcessedFileRepository::class);
-    }
-
-    /**
-     * Returns the file references.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function clearCachePages($file)
-    {
-
-        /** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $tce = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
-        $tce->start([], []);
-
-        #$pages = array_merge(
-        #    $this->findPagesWithFileReferences($file),
-        #    $this->findPagesWithSoftReferences($file)
-        #);
-
-        // Previous code which does not work in TYPO3 CMS 7 LTS.
-        // It is adviced to use "registerPageCacheClearing" but how?
-        #foreach (array_unique($pages) as $page) {
-        #    $tce->clear_cache('pages', $page);
-        #}
-        $tce->clear_cacheCmd('pages');
-    }
-
-    /**
-     * Find all pages which contains file references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    protected function findPagesWithFileReferences($file)
-    {
-
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file_reference');
-        $rows = $queryBuilder
-            ->select('pid')
-            ->from('sys_file_reference')
-            ->groupBy('pid') // no support for distinct
-            ->andWhere(
-                'pid > 0',
-                'uid_local = ' . $file->getUid()
-            )
-            ->execute()
-            ->fetchAll();
-
-        foreach ($rows as $row) {
-            $pages[] = $row['pid'];
-
-        }
-
-        return $pages;
-    }
-
-    /**
-     * Find all pages which have soft references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    #protected function findPagesWithSoftReferences(File $file)
-    #{
-    #    $subClauseParts = array(
-    #        'deleted = 0',
-    #        '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
-    #        'ref_table = "sys_file"',
-    #        'tablename = "tt_content"',
-    #        'ref_uid = ' . $file->getUid(),
-    #    );
-    #
-    #    $rows = $this->getDatabaseConnection()->exec_SELECTquery(
-    #        'DISTINCT pid',
-    #        'tt_content',
-    #        sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
-    #            implode(' AND ', $subClauseParts),
-    #            $this->getWhereClauseForEnabledFields('tt_content')
-    #        )
-    #    );
-    #
-    #    // Compute result
-    #    $pages = [];
-    #    while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
-    #        $pages[] = $affectedPage['pid'];
-    #    }
-    #
-    #    return $pages;
-    #}
-
-    /**
-     * Get the WHERE clause for the enabled fields given a $tableName.
-     *
-     * @param string $tableName
-     * @return string
-     */
-    protected function getWhereClauseForEnabledFields($tableName)
-    {
-        if ($this->isFrontendMode()) {
-            // frontend context
-            $whereClause = $this->getPageRepository()->deleteClause($tableName);
-        } else {
-            // backend context
-            $whereClause = BackendUtility::deleteClause($tableName);
-        }
-        return $whereClause;
-    }
-
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return string
-     */
-    protected function isFrontendMode()
-    {
-        return TYPO3_MODE == 'FE';
-    }
-
-    /**
-     * Returns an instance of the page repository.
-     *
-     * @return \TYPO3\CMS\Frontend\Page\PageRepository
-     */
-    protected function getPageRepository()
-    {
-        return $GLOBALS['TSFE']->sys_page;
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
+	/**
+	 * Traverse all files and initialize cache values.
+	 *
+	 * @return int
+	 */
+	public function warmUp()
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$rows = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where('storage > 0')
+			->execute()
+			->fetchAll();
+
+		$counter = 0;
+		foreach ($rows as $row) {
+
+			$fileIdentifier = $row['uid'];
+			$totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
+
+			$values = array(
+				'number_of_references' => $totalNumberOfReferences
+			);
+
+			$this->getDataService()->update(
+				'sys_file',
+				$values,
+				[
+					'uid' => $fileIdentifier
+				]
+			);
+			$counter++;
+		}
+
+		return $counter;
+	}
+
+	/**
+	 * Clear all possible cache related to a file.
+	 * This method is useful when replacing a file for instance.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function clearCache(File $file)
+	{
+
+		$this->clearCachePages($file);
+		$this->flushProcessedFiles($file);
+	}
+
+	/**
+	 * Remove all processed files that belong to the given File object.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function flushProcessedFiles(File $file)
+	{
+
+		/** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
+		foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
+			if ($processedFile->exists()) {
+				$processedFile->delete(true);
+			}
+
+			$this->getDataService()->delete(
+				'sys_file_processedfile',
+				[
+					'uid' => (int)$processedFile->getUid()
+				]
+			);
+		}
+	}
+
+	/**
+	 * Return a processed file repository
+	 *
+	 * @return \TYPO3\CMS\Core\Resource\ProcessedFileRepository|object
+	 */
+	protected function getProcessedFileRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ProcessedFileRepository::class);
+	}
+
+	/**
+	 * Returns the file references.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function clearCachePages($file)
+	{
+
+		/** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$tce = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+		$tce->start([], []);
+
+		#$pages = array_merge(
+		#    $this->findPagesWithFileReferences($file),
+		#    $this->findPagesWithSoftReferences($file)
+		#);
+
+		// Previous code which does not work in TYPO3 CMS 7 LTS.
+		// It is adviced to use "registerPageCacheClearing" but how?
+		#foreach (array_unique($pages) as $page) {
+		#    $tce->clear_cache('pages', $page);
+		#}
+		$tce->clear_cacheCmd('pages');
+	}
+
+	/**
+	 * Find all pages which contains file references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	protected function findPagesWithFileReferences($file)
+	{
+
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file_reference');
+		$rows = $queryBuilder
+			->select('pid')
+			->from('sys_file_reference')
+			->groupBy('pid') // no support for distinct
+			->andWhere(
+				'pid > 0',
+				'uid_local = ' . $file->getUid()
+			)
+			->execute()
+			->fetchAll();
+
+		foreach ($rows as $row) {
+			$pages[] = $row['pid'];
+
+		}
+
+		return $pages;
+	}
+
+	/**
+	 * Find all pages which have soft references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	#protected function findPagesWithSoftReferences(File $file)
+	#{
+	#    $subClauseParts = array(
+	#        'deleted = 0',
+	#        '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
+	#        'ref_table = "sys_file"',
+	#        'tablename = "tt_content"',
+	#        'ref_uid = ' . $file->getUid(),
+	#    );
+	#
+	#    $rows = $this->getDatabaseConnection()->exec_SELECTquery(
+	#        'DISTINCT pid',
+	#        'tt_content',
+	#        sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
+	#            implode(' AND ', $subClauseParts),
+	#            $this->getWhereClauseForEnabledFields('tt_content')
+	#        )
+	#    );
+	#
+	#    // Compute result
+	#    $pages = [];
+	#    while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
+	#        $pages[] = $affectedPage['pid'];
+	#    }
+	#
+	#    return $pages;
+	#}
+
+	/**
+	 * Get the WHERE clause for the enabled fields given a $tableName.
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	protected function getWhereClauseForEnabledFields($tableName)
+	{
+		if ($this->isFrontendMode()) {
+			// frontend context
+			$whereClause = $this->getPageRepository()->deleteClause($tableName);
+		} else {
+			// backend context
+			$whereClause = BackendUtility::deleteClause($tableName);
+		}
+		return $whereClause;
+	}
+
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return string
+	 */
+	protected function isFrontendMode()
+	{
+		return TYPO3_MODE == 'FE';
+	}
+
+	/**
+	 * Returns an instance of the page repository.
+	 *
+	 * @return \TYPO3\CMS\Frontend\Page\PageRepository
+	 */
+	protected function getPageRepository()
+	{
+		return $GLOBALS['TSFE']->sys_page;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
             ->groupBy('pid') // no support for distinct
             ->andWhere(
                 'pid > 0',
-                'uid_local = ' . $file->getUid()
+                'uid_local = '.$file->getUid()
             )
             ->execute()
             ->fetchAll();

Classes/FileUpload/UploadManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -268,7 +268,7 @@
      * Remove accent from a string
      *
      * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L297
-     * @param $string
+     * @param string $string
      * @return string
      */
     protected function unAccent($string)

Spacing +5 added lines, -5 removed lines

@@ -128,8 +128,8 @@ 
         $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);
+            $size = max(1, $this->sizeLimit / 1024 / 1024).'M';
+            $this->throwException('increase post_max_size and upload_max_filesize to '.$size);
         }
     }
 
@@ -197,7 +197,7 @@ 
         $isAllowed = $this->checkFileExtensionPermission($fileName);
         if (!$isAllowed) {
             $these = PermissionUtility::getInstance()->getAllowedExtensionList();
-            $this->throwException('File has an invalid extension, it should be one of ' . $these . '.');
+            $this->throwException('File has an invalid extension, it should be one of '.$these.'.');
         }
     }
 
@@ -255,7 +255,7 @@ 
      */
     public function sanitizeFileName($fileName, $slug = '-', $extra = null)
     {
-        return trim(preg_replace('~[^0-9a-z_' . preg_quote($extra, '~') . ']+~i', $slug, $this->unAccent($fileName)), $slug);
+        return trim(preg_replace('~[^0-9a-z_'.preg_quote($extra, '~').']+~i', $slug, $this->unAccent($fileName)), $slug);
     }
 
     /**
@@ -293,7 +293,7 @@ 
      */
     protected function initializeUploadFolder()
     {
-        $this->uploadFolder = PATH_site . self::UPLOAD_FOLDER;
+        $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)) {

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/Utility/DomElement.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      * Sanitize an id
      *
      * @param string $input
-     * @return mixed
+     * @return string
      */
     protected function sanitizeId($input)
     {

Indentation +47 added lines, -47 removed lines

@@ -16,57 +16,57 @@
 class DomElement implements SingletonInterface
 {
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Media\Utility\DomElement|object
-     */
-    static public function getInstance()
-    {
-        return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\Utility\DomElement::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\DomElement|object
+	 */
+	static public function getInstance()
+	{
+		return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\Utility\DomElement::class);
+	}
 
-    /**
-     * Format an id given an input string
-     *
-     * @param string $input
-     * @return string
-     */
-    public function formatId($input)
-    {
+	/**
+	 * Format an id given an input string
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	public function formatId($input)
+	{
 
-        // remove the capital letter from the id
-        $segments = preg_split('/(?=[A-Z])/', $input);
-        $segments = array_map('strtolower', $segments);
-        if ($segments[0] == '') {
-            array_shift($segments);
-        }
-        $result = implode('-', $segments);
+		// remove the capital letter from the id
+		$segments = preg_split('/(?=[A-Z])/', $input);
+		$segments = array_map('strtolower', $segments);
+		if ($segments[0] == '') {
+			array_shift($segments);
+		}
+		$result = implode('-', $segments);
 
-        return $this->sanitizeId($result);
-    }
+		return $this->sanitizeId($result);
+	}
 
-    /**
-     * Sanitize an id
-     *
-     * @param string $input
-     * @return mixed
-     */
-    protected function sanitizeId($input)
-    {
+	/**
+	 * Sanitize an id
+	 *
+	 * @param string $input
+	 * @return mixed
+	 */
+	protected function sanitizeId($input)
+	{
 
-        // remove the track of possible namespace
-        $searches[] = ' ';
-        $searches[] = '_';
-        $searches[] = '--';
-        $searches[] = '[';
-        $searches[] = ']';
-        $replaces[] = '-';
-        $replaces[] = '-';
-        $replaces[] = '-';
-        $replaces[] = '-';
-        $replaces[] = '';
-        return str_replace($searches, $replaces, strtolower($input));
-    }
+		// remove the track of possible namespace
+		$searches[] = ' ';
+		$searches[] = '_';
+		$searches[] = '--';
+		$searches[] = '[';
+		$searches[] = ']';
+		$replaces[] = '-';
+		$replaces[] = '-';
+		$replaces[] = '-';
+		$replaces[] = '-';
+		$replaces[] = '';
+		return str_replace($searches, $replaces, strtolower($input));
+	}
 
 }

Classes/View/Info/SelectedFolderInfo.php

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 
 use Fab\Media\Module\MediaModule;
 use TYPO3\CMS\Core\Resource\Folder;
-use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Resource\Utility\ListUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use Fab\Vidi\View\AbstractComponentView;

Indentation +48 added lines, -48 removed lines

@@ -21,59 +21,59 @@
 class SelectedFolderInfo extends AbstractComponentView
 {
 
-    /**
-     * @var array
-     */
-    public $notAllowedMountPoints = [];
+	/**
+	 * @var array
+	 */
+	public $notAllowedMountPoints = [];
 
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
 
-        $result = '';
-        if ($this->getMediaModule()->hasFolderTree()) {
+		$result = '';
+		if ($this->getMediaModule()->hasFolderTree()) {
 
-            $folder = $this->getMediaModule()->getCurrentFolder();
-            $result = sprintf('<h1>%s</h1>', $this->getFolderName($folder));
-        }
+			$folder = $this->getMediaModule()->getCurrentFolder();
+			$result = sprintf('<h1>%s</h1>', $this->getFolderName($folder));
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Get main headline based on active folder or storage for backend module
-     *
-     * Folder names are resolved to their special names like done in the tree view.
-     *
-     * @param Folder $folder
-     * @return string
-     */
-    protected function getFolderName(Folder $folder)
-    {
-        $name = $folder->getName();
-        if ($name === '') {
-            // Show storage name on storage root
-            if ($folder->getIdentifier() === '/') {
-                $name = $folder->getStorage()->getName();
-            }
-        } else {
-            $name = key(ListUtility::resolveSpecialFolderNames(
-                array($name => $folder)
-            ));
-        }
-        return $name;
-    }
+	/**
+	 * Get main headline based on active folder or storage for backend module
+	 *
+	 * Folder names are resolved to their special names like done in the tree view.
+	 *
+	 * @param Folder $folder
+	 * @return string
+	 */
+	protected function getFolderName(Folder $folder)
+	{
+		$name = $folder->getName();
+		if ($name === '') {
+			// Show storage name on storage root
+			if ($folder->getIdentifier() === '/') {
+				$name = $folder->getStorage()->getName();
+			}
+		} else {
+			$name = key(ListUtility::resolveSpecialFolderNames(
+				array($name => $folder)
+			));
+		}
+		return $name;
+	}
 
-    /**
-     * @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/View/Warning/ConfigurationWarning.php

Doc Comments +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
     }
 
     /**
-     * @return boolean
+     * @return boolean|null
      */
     protected function configureStorage()
     {
@@ -302,7 +302,7 @@ 
     }
 
     /**
-     * @return boolean
+     * @return integer
      */
     protected function canBeInitializedSilently()
     {

Indentation +324 added lines, -324 removed lines

@@ -21,139 +21,139 @@ 
 class ConfigurationWarning extends AbstractComponentView
 {
 
-    /**
-     * @var array
-     */
-    protected $notAllowedMountPoints = [];
-
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
-
-        $result = '';
-
-        // Check whether storage is configured or not.
-        if ($this->checkStorageNotConfigured()) {
-            $this->configureStorage();
-            $result .= $this->formatMessageForStorageConfigured();
-        }
-
-        // Check whether storage is online or not.
-        if ($this->checkStorageOffline()) {
-            $result .= $this->formatMessageForStorageOffline();
-        }
-
-        // Check all mount points of the storage are available
-        if (!$this->checkMountPoints()) {
-            $result .= $this->formatMessageForMountPoints();
-        }
-
-        // Check all mount points of the storage are available
-        if (!$this->hasBeenWarmedUp() && !$this->checkColumnNumberOfReferences()) {
-            if ($this->canBeInitializedSilently() < 2000) {
-                $numberOfFiles = $this->getCacheService()->warmUp();
-                $result .= $this->formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFiles);
-                touch($this->getWarmUpSemaphoreFile());
-            } else {
-                $result .= $this->formatMessageForUpdateRequiredColumnNumberOfReferences();
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return \Fab\Media\Cache\CacheService|object
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
-    }
-
-    /**
-     * @return boolean
-     */
-    protected function configureStorage()
-    {
-        $tableName = 'sys_file_storage';
-        $fields = array(
-            'maximum_dimension_original_image',
-            'extension_allowed_file_type_1',
-            'extension_allowed_file_type_2',
-            'extension_allowed_file_type_3',
-            'extension_allowed_file_type_4',
-            'extension_allowed_file_type_5',
-        );
-
-        $values = [];
-        foreach ($fields as $field) {
-            $values[$field] = Tca::table($tableName)->field($field)->getDefaultValue();
-        }
-
-        $storage = $this->getMediaModule()->getCurrentStorage();
-        $this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = ' . $storage->getUid(), $values);
-    }
-
-    /**
-     * @return bool
-     */
-    protected function hasBeenWarmedUp()
-    {
-        return is_file(($this->getWarmUpSemaphoreFile()));
-    }
-
-    /**
-     * @return string
-     */
-    protected function getWarmUpSemaphoreFile()
-    {
-        return PATH_site . 'typo3temp/.media_cache_warmed_up';
-    }
-
-    /**
-     * Check whether the storage is correctly configured.
-     *
-     * @return boolean
-     */
-    protected function checkStorageNotConfigured()
-    {
-        $currentStorage = $this->getMediaModule()->getCurrentStorage();
-        $storageRecord = $currentStorage->getStorageRecord();
-
-        // Take the storage fields and check whether some data was initialized.
-        $fields = array(
-            'extension_allowed_file_type_1',
-            'extension_allowed_file_type_2',
-            'extension_allowed_file_type_3',
-            'extension_allowed_file_type_4',
-            'extension_allowed_file_type_5',
-        );
-
-        $result = true;
-        foreach ($fields as $fieldName) {
-            // true means the storage has data and thus was configured / saved once.
-            if (!empty($storageRecord[$fieldName])) {
-                $result = false;
-                break;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Format a message whenever the storage is offline.
-     *
-     * @return string
-     */
-    protected function formatMessageForStorageConfigured()
-    {
-        $storage = $this->getMediaModule()->getCurrentStorage();
-
-        $result = <<< EOF
+	/**
+	 * @var array
+	 */
+	protected $notAllowedMountPoints = [];
+
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+
+		$result = '';
+
+		// Check whether storage is configured or not.
+		if ($this->checkStorageNotConfigured()) {
+			$this->configureStorage();
+			$result .= $this->formatMessageForStorageConfigured();
+		}
+
+		// Check whether storage is online or not.
+		if ($this->checkStorageOffline()) {
+			$result .= $this->formatMessageForStorageOffline();
+		}
+
+		// Check all mount points of the storage are available
+		if (!$this->checkMountPoints()) {
+			$result .= $this->formatMessageForMountPoints();
+		}
+
+		// Check all mount points of the storage are available
+		if (!$this->hasBeenWarmedUp() && !$this->checkColumnNumberOfReferences()) {
+			if ($this->canBeInitializedSilently() < 2000) {
+				$numberOfFiles = $this->getCacheService()->warmUp();
+				$result .= $this->formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFiles);
+				touch($this->getWarmUpSemaphoreFile());
+			} else {
+				$result .= $this->formatMessageForUpdateRequiredColumnNumberOfReferences();
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return \Fab\Media\Cache\CacheService|object
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
+	}
+
+	/**
+	 * @return boolean
+	 */
+	protected function configureStorage()
+	{
+		$tableName = 'sys_file_storage';
+		$fields = array(
+			'maximum_dimension_original_image',
+			'extension_allowed_file_type_1',
+			'extension_allowed_file_type_2',
+			'extension_allowed_file_type_3',
+			'extension_allowed_file_type_4',
+			'extension_allowed_file_type_5',
+		);
+
+		$values = [];
+		foreach ($fields as $field) {
+			$values[$field] = Tca::table($tableName)->field($field)->getDefaultValue();
+		}
+
+		$storage = $this->getMediaModule()->getCurrentStorage();
+		$this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = ' . $storage->getUid(), $values);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function hasBeenWarmedUp()
+	{
+		return is_file(($this->getWarmUpSemaphoreFile()));
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getWarmUpSemaphoreFile()
+	{
+		return PATH_site . 'typo3temp/.media_cache_warmed_up';
+	}
+
+	/**
+	 * Check whether the storage is correctly configured.
+	 *
+	 * @return boolean
+	 */
+	protected function checkStorageNotConfigured()
+	{
+		$currentStorage = $this->getMediaModule()->getCurrentStorage();
+		$storageRecord = $currentStorage->getStorageRecord();
+
+		// Take the storage fields and check whether some data was initialized.
+		$fields = array(
+			'extension_allowed_file_type_1',
+			'extension_allowed_file_type_2',
+			'extension_allowed_file_type_3',
+			'extension_allowed_file_type_4',
+			'extension_allowed_file_type_5',
+		);
+
+		$result = true;
+		foreach ($fields as $fieldName) {
+			// true means the storage has data and thus was configured / saved once.
+			if (!empty($storageRecord[$fieldName])) {
+				$result = false;
+				break;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Format a message whenever the storage is offline.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForStorageConfigured()
+	{
+		$storage = $this->getMediaModule()->getCurrentStorage();
+
+		$result = <<< EOF
 			<div class="alert alert-info">
 				<div class="alert-title">
 						Storage has been configured.
@@ -166,29 +166,29 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * Check whether the storage is online or not.
-     *
-     * @return boolean
-     */
-    protected function checkStorageOffline()
-    {
-        return !$this->getMediaModule()->getCurrentStorage()->isOnline();
-    }
-
-    /**
-     * Format a message whenever the storage is offline.
-     *
-     * @return string
-     */
-    protected function formatMessageForStorageOffline()
-    {
-        $storage = $this->getMediaModule()->getCurrentStorage();
-
-        $result = <<< EOF
+		return $result;
+	}
+
+	/**
+	 * Check whether the storage is online or not.
+	 *
+	 * @return boolean
+	 */
+	protected function checkStorageOffline()
+	{
+		return !$this->getMediaModule()->getCurrentStorage()->isOnline();
+	}
+
+	/**
+	 * Format a message whenever the storage is offline.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForStorageOffline()
+	{
+		$storage = $this->getMediaModule()->getCurrentStorage();
+
+		$result = <<< EOF
 			<div class="alert alert-warning">
 					<div class="alert-title">
 						Storage is currently offline
@@ -200,85 +200,85 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * Check whether mount points privilege are ok.
-     *
-     * @return boolean
-     */
-    protected function checkMountPoints()
-    {
-        if (!$this->getBackendUser()->isAdmin()) {
-
-            $fileMounts = $this->getBackendUser()->getFileMountRecords();
-
-            $fileMountIdentifiers = [];
-            foreach ($fileMounts as $fileMount) {
-                $fileMountIdentifiers[] = $fileMount['uid'];
-            }
-
-            $storage = $this->getMediaModule()->getCurrentStorage();
-            $storageRecord = $storage->getStorageRecord();
-            $fieldNames = array(
-                'mount_point_file_type_1',
-                'mount_point_file_type_2',
-                'mount_point_file_type_3',
-                'mount_point_file_type_4',
-                'mount_point_file_type_5',
-            );
-            foreach ($fieldNames as $fileName) {
-                $fileMountIdentifier = (int)$storageRecord[$fileName];
-                if ($fileMountIdentifier > 0 && !in_array($fileMountIdentifier, $fileMountIdentifiers)) {
-                    $this->notAllowedMountPoints[] = $this->fetchMountPoint($fileMountIdentifier);
-                } else {
-                    # $fileMountIdentifier
-                    $folder = $storage->getRootLevelFolder();
-                }
-            }
-        }
-        return empty($this->notAllowedMountPoints);
-    }
-
-    /**
-     * Return a mount point according to an file mount identifier.
-     *
-     * @param string $identifier
-     * @return array
-     */
-    protected function fetchMountPoint($identifier)
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_filemounts');
-        return $queryBuilder
-            ->select('*')
-            ->from('sys_filemounts')
-            ->where('uid = ' . $identifier)
-            ->execute()
-            ->fetch();
-    }
-
-    /**
-     * Format a message whenever mount points privilege are not OK.
-     *
-     * @return string
-     */
-    protected function formatMessageForMountPoints()
-    {
-
-        $storage = $this->getMediaModule()->getCurrentStorage();
-        $backendUser = $this->getBackendUser();
-
-        foreach ($this->notAllowedMountPoints as $notAllowedMountPoints) {
-            $list = sprintf('<li>"%s" with path %s</li>',
-                $notAllowedMountPoints['title'],
-                $notAllowedMountPoints['path']
-            );
-
-        }
-
-        $result = <<< EOF
+		return $result;
+	}
+
+	/**
+	 * Check whether mount points privilege are ok.
+	 *
+	 * @return boolean
+	 */
+	protected function checkMountPoints()
+	{
+		if (!$this->getBackendUser()->isAdmin()) {
+
+			$fileMounts = $this->getBackendUser()->getFileMountRecords();
+
+			$fileMountIdentifiers = [];
+			foreach ($fileMounts as $fileMount) {
+				$fileMountIdentifiers[] = $fileMount['uid'];
+			}
+
+			$storage = $this->getMediaModule()->getCurrentStorage();
+			$storageRecord = $storage->getStorageRecord();
+			$fieldNames = array(
+				'mount_point_file_type_1',
+				'mount_point_file_type_2',
+				'mount_point_file_type_3',
+				'mount_point_file_type_4',
+				'mount_point_file_type_5',
+			);
+			foreach ($fieldNames as $fileName) {
+				$fileMountIdentifier = (int)$storageRecord[$fileName];
+				if ($fileMountIdentifier > 0 && !in_array($fileMountIdentifier, $fileMountIdentifiers)) {
+					$this->notAllowedMountPoints[] = $this->fetchMountPoint($fileMountIdentifier);
+				} else {
+					# $fileMountIdentifier
+					$folder = $storage->getRootLevelFolder();
+				}
+			}
+		}
+		return empty($this->notAllowedMountPoints);
+	}
+
+	/**
+	 * Return a mount point according to an file mount identifier.
+	 *
+	 * @param string $identifier
+	 * @return array
+	 */
+	protected function fetchMountPoint($identifier)
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_filemounts');
+		return $queryBuilder
+			->select('*')
+			->from('sys_filemounts')
+			->where('uid = ' . $identifier)
+			->execute()
+			->fetch();
+	}
+
+	/**
+	 * Format a message whenever mount points privilege are not OK.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForMountPoints()
+	{
+
+		$storage = $this->getMediaModule()->getCurrentStorage();
+		$backendUser = $this->getBackendUser();
+
+		foreach ($this->notAllowedMountPoints as $notAllowedMountPoints) {
+			$list = sprintf('<li>"%s" with path %s</li>',
+				$notAllowedMountPoints['title'],
+				$notAllowedMountPoints['path']
+			);
+
+		}
+
+		$result = <<< EOF
 			<div class="alert alert-warning">
 					<div class="alert-title">
 						File mount are wrongly configured for user "{$backendUser->user['username']}".
@@ -293,54 +293,54 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * @return boolean
-     */
-    protected function canBeInitializedSilently()
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $count = $queryBuilder
-            ->count('*')
-            ->from('sys_file')
-            ->execute()
-            ->fetchColumn(0);
-        return (int)$count;
-
-    }
-
-    /**
-     * Check whether the column "total_of_references" has been already processed once.
-     *
-     * @return boolean
-     */
-    protected function checkColumnNumberOfReferences()
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $file = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where('number_of_references > 0')
-            ->execute()
-            ->fetch();
-
-        return !empty($file);
-    }
-
-    /**
-     * Format a message if columns "total_of_references" looks wrong.
-     *
-     * @param int $numberOfFile
-     * @return string
-     */
-    protected function formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFile)
-    {
-
-        $result = <<< EOF
+		return $result;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	protected function canBeInitializedSilently()
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$count = $queryBuilder
+			->count('*')
+			->from('sys_file')
+			->execute()
+			->fetchColumn(0);
+		return (int)$count;
+
+	}
+
+	/**
+	 * Check whether the column "total_of_references" has been already processed once.
+	 *
+	 * @return boolean
+	 */
+	protected function checkColumnNumberOfReferences()
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$file = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where('number_of_references > 0')
+			->execute()
+			->fetch();
+
+		return !empty($file);
+	}
+
+	/**
+	 * Format a message if columns "total_of_references" looks wrong.
+	 *
+	 * @param int $numberOfFile
+	 * @return string
+	 */
+	protected function formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFile)
+	{
+
+		$result = <<< EOF
 			<div class="alert alert-success">
 				<div class="alert-title">
 						Initialized column "number_of_references" for ${numberOfFile} files
@@ -357,19 +357,19 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     * Format a message if columns "total_of_references" looks wrong.
-     *
-     * @return string
-     */
-    protected function formatMessageForUpdateRequiredColumnNumberOfReferences()
-    {
+	/**
+	 * Format a message if columns "total_of_references" looks wrong.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForUpdateRequiredColumnNumberOfReferences()
+	{
 
-        $result = <<< EOF
+		$result = <<< EOF
 			<div class="alert alert-warning">
 				<div class="alert-title">
 						Column "number_of_references" requires to be initialized.
@@ -388,36 +388,36 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+		return $result;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
         }
 
         $storage = $this->getMediaModule()->getCurrentStorage();
-        $this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = ' . $storage->getUid(), $values);
+        $this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = '.$storage->getUid(), $values);
     }
 
     /**
@@ -111,7 +111,7 @@ 
      */
     protected function getWarmUpSemaphoreFile()
     {
-        return PATH_site . 'typo3temp/.media_cache_warmed_up';
+        return PATH_site.'typo3temp/.media_cache_warmed_up';
     }
 
     /**
@@ -254,7 +254,7 @@ 
         return $queryBuilder
             ->select('*')
             ->from('sys_filemounts')
-            ->where('uid = ' . $identifier)
+            ->where('uid = '.$identifier)
             ->execute()
             ->fetch();
     }

Classes/View/MenuItem/FilePickerMenuItem.php

Indentation +32 added lines, -32 removed lines

@@ -25,38 +25,38 @@
 class FilePickerMenuItem extends AbstractComponentView
 {
 
-    /**
-     * Renders a "file picker" menu item to be placed in the grid menu of Media.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
-        if ($this->getModuleLoader()->hasPlugin('filePicker')) {
-            $result = sprintf('<li><a href="%s" class="mass-file-picker" data-argument="assets">%s Insert files</a>',
-                $this->getMassDeleteUri(),
-                $this->getIconFactory()->getIcon('extensions-media-image-export', Icon::SIZE_SMALL)
-            );
-        }
-        return $result;
-    }
+	/**
+	 * Renders a "file picker" menu item to be placed in the grid menu of Media.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
+		if ($this->getModuleLoader()->hasPlugin('filePicker')) {
+			$result = sprintf('<li><a href="%s" class="mass-file-picker" data-argument="assets">%s Insert files</a>',
+				$this->getMassDeleteUri(),
+				$this->getIconFactory()->getIcon('extensions-media-image-export', Icon::SIZE_SMALL)
+			);
+		}
+		return $result;
+	}
 
-    /**
-     * Render a mass delete URI.
-     *
-     * @return string
-     */
-    protected function getMassDeleteUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'Asset',
-                'action' => '',
-                'format' => 'json',
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * Render a mass delete URI.
+	 *
+	 * @return string
+	 */
+	protected function getMassDeleteUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'Asset',
+				'action' => '',
+				'format' => 'json',
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
 }

Classes/Grid/CategoryRenderer.php

Indentation +18 added lines, -18 removed lines

@@ -22,25 +22,25 @@
 class CategoryRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Renders category list of an asset in the grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
+	/**
+	 * Renders category list of an asset in the grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
 
-        $categories = $this->object['metadata']['categories'];
-        if (!empty($categories)) {
+		$categories = $this->object['metadata']['categories'];
+		if (!empty($categories)) {
 
-            /** @var $category \TYPO3\CMS\Extbase\Domain\Model\Category */
-            foreach ($categories as $category) {
-                $result .= sprintf('<li>%s</li>', $category['title']);
-            }
-            $result = sprintf('<ul class="category-list">%s</ul>', $result);
-        }
-        return $result;
-    }
+			/** @var $category \TYPO3\CMS\Extbase\Domain\Model\Category */
+			foreach ($categories as $category) {
+				$result .= sprintf('<li>%s</li>', $category['title']);
+			}
+			$result = sprintf('<ul class="category-list">%s</ul>', $result);
+		}
+		return $result;
+	}
 
 }

Classes/Grid/FrontendPermissionRenderer.php

Indentation +18 added lines, -18 removed lines

@@ -22,24 +22,24 @@
 class FrontendPermissionRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Render permission in the grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
+	/**
+	 * Render permission in the grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
 
-        $frontendUserGroups = $this->object['metadata']['fe_groups'];
-        if (!empty($frontendUserGroups)) {
+		$frontendUserGroups = $this->object['metadata']['fe_groups'];
+		if (!empty($frontendUserGroups)) {
 
-            /** @var $frontendUserGroup \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup */
-            foreach ($frontendUserGroups as $frontendUserGroup) {
-                $result .= sprintf('<li style="list-style: disc">%s</li>', $frontendUserGroup['title']);
-            }
-            $result = sprintf('<ul>%s</ul>', $result);
-        }
-        return $result;
-    }
+			/** @var $frontendUserGroup \TYPO3\CMS\Extbase\Domain\Model\FrontendUserGroup */
+			foreach ($frontendUserGroups as $frontendUserGroup) {
+				$result .= sprintf('<li style="list-style: disc">%s</li>', $frontendUserGroup['title']);
+			}
+			$result = sprintf('<ul>%s</ul>', $result);
+		}
+		return $result;
+	}
 }

Classes/Form/FormFieldInterface.php

Indentation +9 added lines, -9 removed lines

@@ -20,14 +20,14 @@
 interface FormFieldInterface
 {
 
-    /**
-     * @return string
-     */
-    public function render();
+	/**
+	 * @return string
+	 */
+	public function render();
 
-    /**
-     * @param string $template
-     * @return \Fab\Media\Form\FormFieldInterface
-     */
-    public function setTemplate($template);
+	/**
+	 * @param string $template
+	 * @return \Fab\Media\Form\FormFieldInterface
+	 */
+	public function setTemplate($template);
 }