fabarea / media

Classes/Facet/ActionPermissionFacet.php

Indentation +237 added lines, -237 removed lines

@@ -23,241 +23,241 @@
  */
 class ActionPermissionFacet implements FacetInterface
 {
-    /**
-     * @var string
-     */
-    protected $name = '__action_permission';
-
-    /**
-     * @var string
-     */
-    protected $label = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:permission';
-
-    /**
-     * @var array
-     */
-    protected $suggestions = array(
-        'r' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.read_only',
-        'w' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.write',
-    );
-
-    /**
-     * @var string
-     */
-    protected $fieldNameAndPath = '';
-
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var bool
-     */
-    protected $canModifyMatcher = false;
-
-    /**
-     * Constructor of a Generic Facet in Vidi.
-     *
-     * @param string $name
-     * @param string $label
-     * @param array $suggestions
-     * @param string $fieldNameAndPath
-     */
-    public function __construct($name = '', $label = '', array $suggestions = [], $fieldNameAndPath = '')
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->getLanguageService()->sL($this->label);
-    }
-
-    /**
-     * @return array
-     */
-    public function getSuggestions()
-    {
-        $suggestions = [];
-        foreach ($this->suggestions as $key => $label) {
-            $suggestions[] = array($key => $this->getLanguageService()->sL($label));
-        }
-
-        return $suggestions;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSuggestions()
-    {
-        return true;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType)
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function canModifyMatcher()
-    {
-        return $this->canModifyMatcher;
-    }
-
-    /**
-     * @param Matcher $matcher
-     * @param $value
-     * @return Matcher
-     */
-    public function modifyMatcher(Matcher $matcher, $value)
-    {
-        return $matcher;
-    }
-
-    /**
-     * @param AfterFindContentObjectsSignalArguments $signalArguments
-     * @return array
-     */
-    public function modifyResultSet(AfterFindContentObjectsSignalArguments $signalArguments)
-    {
-        if ($signalArguments->getDataType() === 'sys_file') {
-            $queryParts = $this->getQueryParts();
-
-            if (!empty($queryParts)) {
-                $permission = $this->getPermissionValue($queryParts);
-
-                if ($permission) {
-                    // We are force to query the content repository again here without limit
-                    $matcher = $signalArguments->getMatcher();
-                    $order = $signalArguments->getOrder();
-                    $objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order);
-
-                    $filteredObjects = [];
-                    foreach ($objects as $object) {
-                        $file = $this->getFileConverter()->convert($object->getUid());
-                        if ($permission === 'read' && !$file->checkActionPermission('write')) {
-                            $filteredObjects[] = $object;
-                        } elseif ($permission === 'write' && $file->checkActionPermission('write')) {
-                            $filteredObjects[] = $object;
-                        }
-                    }
-
-                    // Only take part of the array according to offset and limit.
-                    $offset = $signalArguments->getOffset();
-                    $limit = $signalArguments->getLimit();
-                    $signalArguments->setContentObjects(array_slice($filteredObjects, $offset, $limit));
-
-                    // Count number of records
-                    $signalArguments->setNumberOfObjects(count($filteredObjects));
-                    $signalArguments->setHasBeenProcessed(true);
-                }
-            }
-        }
-
-        return array($signalArguments);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getQueryParts()
-    {
-        // Transmit recursive selection parameter.
-        $parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $parameters = GeneralUtility::_GP($parameterPrefix);
-
-        $queryParts = [];
-        if (!empty($parameters['searchTerm'])) {
-            $query = rawurldecode($parameters['searchTerm']);
-            $queryParts = json_decode($query, true);
-        }
-
-        return $queryParts;
-    }
-
-    /**
-     * Retrieve the search permission value.
-     *
-     * @param array $queryParts
-     * @return string
-     */
-    protected function getPermissionValue(array $queryParts)
-    {
-        $permission = '';
-
-        // Check also amongst labels.
-        $labelReadOnly = $this->getLanguageService()->sL($this->suggestions['r']);
-        $labelWrite = $this->getLanguageService()->sL($this->suggestions['w']);
-
-        foreach ($queryParts as $queryPart) {
-            $facetName = key($queryPart);
-            $value = $queryPart[$facetName];
-            if ($facetName === $this->name) {
-                if ($value === 'r' || $value === $labelReadOnly) {
-                    $permission = 'read';
-                } elseif ($value === 'w' || $value === $labelWrite) {
-                    $permission = 'write';
-                }
-            }
-        }
-        return $permission;
-    }
-
-    /**
-     * Magic method implementation for retrieving state.
-     *
-     * @param array $states
-     * @return $this
-     */
-    public static function __set_state($states)
-    {
-        return new ActionPermissionFacet($states['name'], $states['label'], $states['suggestions'], $states['fieldNameAndPath']);
-    }
-
-    /**
-     * @return LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return $GLOBALS['LANG'];
-    }
-
-    /**
-     * @return ContentToFileConverter
-     * @throws \InvalidArgumentException
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(ContentToFileConverter::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     * @throws \InvalidArgumentException
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * @var string
+	 */
+	protected $name = '__action_permission';
+
+	/**
+	 * @var string
+	 */
+	protected $label = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:permission';
+
+	/**
+	 * @var array
+	 */
+	protected $suggestions = array(
+		'r' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.read_only',
+		'w' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.write',
+	);
+
+	/**
+	 * @var string
+	 */
+	protected $fieldNameAndPath = '';
+
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var bool
+	 */
+	protected $canModifyMatcher = false;
+
+	/**
+	 * Constructor of a Generic Facet in Vidi.
+	 *
+	 * @param string $name
+	 * @param string $label
+	 * @param array $suggestions
+	 * @param string $fieldNameAndPath
+	 */
+	public function __construct($name = '', $label = '', array $suggestions = [], $fieldNameAndPath = '')
+	{
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		return $this->getLanguageService()->sL($this->label);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSuggestions()
+	{
+		$suggestions = [];
+		foreach ($this->suggestions as $key => $label) {
+			$suggestions[] = array($key => $this->getLanguageService()->sL($label));
+		}
+
+		return $suggestions;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasSuggestions()
+	{
+		return true;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType)
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function canModifyMatcher()
+	{
+		return $this->canModifyMatcher;
+	}
+
+	/**
+	 * @param Matcher $matcher
+	 * @param $value
+	 * @return Matcher
+	 */
+	public function modifyMatcher(Matcher $matcher, $value)
+	{
+		return $matcher;
+	}
+
+	/**
+	 * @param AfterFindContentObjectsSignalArguments $signalArguments
+	 * @return array
+	 */
+	public function modifyResultSet(AfterFindContentObjectsSignalArguments $signalArguments)
+	{
+		if ($signalArguments->getDataType() === 'sys_file') {
+			$queryParts = $this->getQueryParts();
+
+			if (!empty($queryParts)) {
+				$permission = $this->getPermissionValue($queryParts);
+
+				if ($permission) {
+					// We are force to query the content repository again here without limit
+					$matcher = $signalArguments->getMatcher();
+					$order = $signalArguments->getOrder();
+					$objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order);
+
+					$filteredObjects = [];
+					foreach ($objects as $object) {
+						$file = $this->getFileConverter()->convert($object->getUid());
+						if ($permission === 'read' && !$file->checkActionPermission('write')) {
+							$filteredObjects[] = $object;
+						} elseif ($permission === 'write' && $file->checkActionPermission('write')) {
+							$filteredObjects[] = $object;
+						}
+					}
+
+					// Only take part of the array according to offset and limit.
+					$offset = $signalArguments->getOffset();
+					$limit = $signalArguments->getLimit();
+					$signalArguments->setContentObjects(array_slice($filteredObjects, $offset, $limit));
+
+					// Count number of records
+					$signalArguments->setNumberOfObjects(count($filteredObjects));
+					$signalArguments->setHasBeenProcessed(true);
+				}
+			}
+		}
+
+		return array($signalArguments);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getQueryParts()
+	{
+		// Transmit recursive selection parameter.
+		$parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$parameters = GeneralUtility::_GP($parameterPrefix);
+
+		$queryParts = [];
+		if (!empty($parameters['searchTerm'])) {
+			$query = rawurldecode($parameters['searchTerm']);
+			$queryParts = json_decode($query, true);
+		}
+
+		return $queryParts;
+	}
+
+	/**
+	 * Retrieve the search permission value.
+	 *
+	 * @param array $queryParts
+	 * @return string
+	 */
+	protected function getPermissionValue(array $queryParts)
+	{
+		$permission = '';
+
+		// Check also amongst labels.
+		$labelReadOnly = $this->getLanguageService()->sL($this->suggestions['r']);
+		$labelWrite = $this->getLanguageService()->sL($this->suggestions['w']);
+
+		foreach ($queryParts as $queryPart) {
+			$facetName = key($queryPart);
+			$value = $queryPart[$facetName];
+			if ($facetName === $this->name) {
+				if ($value === 'r' || $value === $labelReadOnly) {
+					$permission = 'read';
+				} elseif ($value === 'w' || $value === $labelWrite) {
+					$permission = 'write';
+				}
+			}
+		}
+		return $permission;
+	}
+
+	/**
+	 * Magic method implementation for retrieving state.
+	 *
+	 * @param array $states
+	 * @return $this
+	 */
+	public static function __set_state($states)
+	{
+		return new ActionPermissionFacet($states['name'], $states['label'], $states['suggestions'], $states['fieldNameAndPath']);
+	}
+
+	/**
+	 * @return LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return $GLOBALS['LANG'];
+	}
+
+	/**
+	 * @return ContentToFileConverter
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(ContentToFileConverter::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 }

Classes/Index/MediaIndexer.php

Indentation +147 added lines, -147 removed lines

@@ -23,151 +23,151 @@
  */
 class MediaIndexer
 {
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage = null;
-
-    /**
-     * @param ResourceStorage $storage
-     */
-    public function __construct(ResourceStorage $storage)
-    {
-        $this->storage = $storage;
-    }
-
-    /**
-     * @param File $file
-     * @return $this
-     */
-    public function updateIndex(File $file)
-    {
-        $this->getCoreIndexer()->updateIndexEntry($file);
-        return $this;
-    }
-
-    /**
-     * @param File $file
-     * @return $this
-     */
-    public function extractMetadata(File $file)
-    {
-        $extractionServices = $this->getExtractorRegistry()->getExtractorsWithDriverSupport($this->storage->getDriverType());
-
-        $newMetaData = array(
-            0 => $file->getMetaData()->get()
-        );
-
-        foreach ($extractionServices as $services) {
-            if (is_array($services)) {
-                foreach ($services as $service) {
-                    if ($service->canProcess($file)) {
-                        $newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
-                    }
-                }
-            } else {
-                $service = $services;
-                // We could optimise here for not repeating this bit
-                if ($service->canProcess($file)) {
-                    $newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
-                }
-            }
-        }
-
-        ksort($newMetaData);
-        $metaData = [];
-        foreach ($newMetaData as $data) {
-            $metaData = array_merge($metaData, $data);
-        }
-        $file->updateProperties($metaData);
-        $this->getMetaDataRepository()->update($file->getUid(), $metaData);
-        $this->getFileIndexRepository()->updateIndexingTime($file->getUid());
-
-        return $this;
-    }
-
-    /**
-     * @param File $file
-     * @return $this
-     */
-    public function applyDefaultCategories(File $file)
-    {
-        $categoryList = ConfigurationUtility::getInstance()->get('default_categories');
-        $categories = GeneralUtility::trimExplode(',', $categoryList, true);
-
-        foreach ($categories as $category) {
-            $values = array(
-                'uid_local' => $category,
-                'uid_foreign' => $this->getFileMetadataIdentifier($file),
-                'tablenames' => 'sys_file_metadata',
-                'fieldname' => 'categories',
-            );
-            $this->getDataService()->insert('sys_category_record_mm', $values);
-        }
-
-        $metaData['categories'] = count($categories);
-        $file->updateProperties($metaData);
-        $this->getMetaDataRepository()->update($file->getUid(), $metaData);
-        $this->getFileIndexRepository()->updateIndexingTime($file->getUid());
-        return $this;
-    }
-
-    /**
-     * Retrieve the file metadata uid which is different from the file uid.
-     *
-     * @param File $file
-     * @return int
-     */
-    protected function getFileMetadataIdentifier(File $file)
-    {
-        $metadataProperties = $file->getMetaData()->get();
-        return isset($metadataProperties['_ORIG_uid']) ? (int)$metadataProperties['_ORIG_uid'] : (int)$metadataProperties['uid'];
-    }
-
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return FileIndexRepository
-     */
-    protected function getFileIndexRepository()
-    {
-        return GeneralUtility::makeInstance(FileIndexRepository::class);
-    }
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return MetaDataRepository
-     */
-    protected function getMetaDataRepository()
-    {
-        return GeneralUtility::makeInstance(MetaDataRepository::class);
-    }
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return ExtractorRegistry
-     */
-    protected function getExtractorRegistry()
-    {
-        return GeneralUtility::makeInstance(ExtractorRegistry::class);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return Indexer|object
-     */
-    protected function getCoreIndexer()
-    {
-        return GeneralUtility::makeInstance(Indexer::class, $this->storage);
-    }
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage = null;
+
+	/**
+	 * @param ResourceStorage $storage
+	 */
+	public function __construct(ResourceStorage $storage)
+	{
+		$this->storage = $storage;
+	}
+
+	/**
+	 * @param File $file
+	 * @return $this
+	 */
+	public function updateIndex(File $file)
+	{
+		$this->getCoreIndexer()->updateIndexEntry($file);
+		return $this;
+	}
+
+	/**
+	 * @param File $file
+	 * @return $this
+	 */
+	public function extractMetadata(File $file)
+	{
+		$extractionServices = $this->getExtractorRegistry()->getExtractorsWithDriverSupport($this->storage->getDriverType());
+
+		$newMetaData = array(
+			0 => $file->getMetaData()->get()
+		);
+
+		foreach ($extractionServices as $services) {
+			if (is_array($services)) {
+				foreach ($services as $service) {
+					if ($service->canProcess($file)) {
+						$newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
+					}
+				}
+			} else {
+				$service = $services;
+				// We could optimise here for not repeating this bit
+				if ($service->canProcess($file)) {
+					$newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
+				}
+			}
+		}
+
+		ksort($newMetaData);
+		$metaData = [];
+		foreach ($newMetaData as $data) {
+			$metaData = array_merge($metaData, $data);
+		}
+		$file->updateProperties($metaData);
+		$this->getMetaDataRepository()->update($file->getUid(), $metaData);
+		$this->getFileIndexRepository()->updateIndexingTime($file->getUid());
+
+		return $this;
+	}
+
+	/**
+	 * @param File $file
+	 * @return $this
+	 */
+	public function applyDefaultCategories(File $file)
+	{
+		$categoryList = ConfigurationUtility::getInstance()->get('default_categories');
+		$categories = GeneralUtility::trimExplode(',', $categoryList, true);
+
+		foreach ($categories as $category) {
+			$values = array(
+				'uid_local' => $category,
+				'uid_foreign' => $this->getFileMetadataIdentifier($file),
+				'tablenames' => 'sys_file_metadata',
+				'fieldname' => 'categories',
+			);
+			$this->getDataService()->insert('sys_category_record_mm', $values);
+		}
+
+		$metaData['categories'] = count($categories);
+		$file->updateProperties($metaData);
+		$this->getMetaDataRepository()->update($file->getUid(), $metaData);
+		$this->getFileIndexRepository()->updateIndexingTime($file->getUid());
+		return $this;
+	}
+
+	/**
+	 * Retrieve the file metadata uid which is different from the file uid.
+	 *
+	 * @param File $file
+	 * @return int
+	 */
+	protected function getFileMetadataIdentifier(File $file)
+	{
+		$metadataProperties = $file->getMetaData()->get();
+		return isset($metadataProperties['_ORIG_uid']) ? (int)$metadataProperties['_ORIG_uid'] : (int)$metadataProperties['uid'];
+	}
+
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return FileIndexRepository
+	 */
+	protected function getFileIndexRepository()
+	{
+		return GeneralUtility::makeInstance(FileIndexRepository::class);
+	}
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return MetaDataRepository
+	 */
+	protected function getMetaDataRepository()
+	{
+		return GeneralUtility::makeInstance(MetaDataRepository::class);
+	}
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return ExtractorRegistry
+	 */
+	protected function getExtractorRegistry()
+	{
+		return GeneralUtility::makeInstance(ExtractorRegistry::class);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return Indexer|object
+	 */
+	protected function getCoreIndexer()
+	{
+		return GeneralUtility::makeInstance(Indexer::class, $this->storage);
+	}
 }

Classes/Index/IndexAnalyser.php

Indentation +161 added lines, -161 removed lines

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

Classes/Index/TitleMetadataExtractor.php

Indentation +111 added lines, -111 removed lines

@@ -20,124 +20,124 @@
  */
 class TitleMetadataExtractor implements ExtractorInterface
 {
-    /**
-     * Returns an array of supported file types;
-     * An empty array indicates all filetypes
-     *
-     * @return array
-     */
-    public function getFileTypeRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Returns an array of supported file types;
+	 * An empty array indicates all filetypes
+	 *
+	 * @return array
+	 */
+	public function getFileTypeRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Get all supported DriverClasses
-     * Since some extractors may only work for local files, and other extractors
-     * are especially made for grabbing data from remote.
-     * Returns array of string with driver names of Drivers which are supported,
-     * If the driver did not register a name, it's the classname.
-     * empty array indicates no restrictions
-     *
-     * @return array
-     */
-    public function getDriverRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Get all supported DriverClasses
+	 * Since some extractors may only work for local files, and other extractors
+	 * are especially made for grabbing data from remote.
+	 * Returns array of string with driver names of Drivers which are supported,
+	 * If the driver did not register a name, it's the classname.
+	 * empty array indicates no restrictions
+	 *
+	 * @return array
+	 */
+	public function getDriverRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Returns the data priority of the extraction Service.
-     * Defines the precedence of Data if several extractors
-     * extracted the same property.
-     * Should be between 1 and 100, 100 is more important than 1
-     *
-     * @return integer
-     */
-    public function getPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the data priority of the extraction Service.
+	 * Defines the precedence of Data if several extractors
+	 * extracted the same property.
+	 * Should be between 1 and 100, 100 is more important than 1
+	 *
+	 * @return integer
+	 */
+	public function getPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Returns the execution priority of the extraction Service
-     * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
-     *
-     * @return integer
-     */
-    public function getExecutionPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the execution priority of the extraction Service
+	 * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
+	 *
+	 * @return integer
+	 */
+	public function getExecutionPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Checks if the given file can be processed by this Extractor
-     *
-     * @param File $file
-     * @return boolean
-     */
-    public function canProcess(File $file)
-    {
-        return true;
-    }
+	/**
+	 * Checks if the given file can be processed by this Extractor
+	 *
+	 * @param File $file
+	 * @return boolean
+	 */
+	public function canProcess(File $file)
+	{
+		return true;
+	}
 
-    /**
-     * The actual processing TASK
-     * Should return an array with database properties for sys_file_metadata to write
-     *
-     * @param File $file
-     * @param array $previousExtractedData optional, contains the array of already extracted data
-     * @return array
-     */
-    public function extractMetaData(File $file, array $previousExtractedData = [])
-    {
-        $metadata = [];
-        $title = $file->getProperty('title');
-        if (empty($title)) {
-            $metadata = array('title' => $this->guessTitle($file->getName()));
-        }
-        return $metadata;
-    }
+	/**
+	 * The actual processing TASK
+	 * Should return an array with database properties for sys_file_metadata to write
+	 *
+	 * @param File $file
+	 * @param array $previousExtractedData optional, contains the array of already extracted data
+	 * @return array
+	 */
+	public function extractMetaData(File $file, array $previousExtractedData = [])
+	{
+		$metadata = [];
+		$title = $file->getProperty('title');
+		if (empty($title)) {
+			$metadata = array('title' => $this->guessTitle($file->getName()));
+		}
+		return $metadata;
+	}
 
-    /**
-     * Guess a title given a file name. Examples:
-     * name: my-file-name.jpg -> title: My file name
-     * name: myFileName.jpg -> title: My file name
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function guessTitle($fileName)
-    {
-        $fileNameWithoutExtension = $this->removeExtension($fileName);
+	/**
+	 * Guess a title given a file name. Examples:
+	 * name: my-file-name.jpg -> title: My file name
+	 * name: myFileName.jpg -> title: My file name
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function guessTitle($fileName)
+	{
+		$fileNameWithoutExtension = $this->removeExtension($fileName);
 
-        $title = $fileNameWithoutExtension;
-        // first case: the name is separated by _ or -
-        // second case: this is an upper camel case name
-        if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
-            $title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
-        } elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
-            $parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
-            $title = implode(' ', $parts);
-        }
+		$title = $fileNameWithoutExtension;
+		// first case: the name is separated by _ or -
+		// second case: this is an upper camel case name
+		if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
+			$title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
+		} elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
+			$parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
+			$title = implode(' ', $parts);
+		}
 
-        // Remove double space.
-        $title = preg_replace('/\s+/', ' ', $title);
-        return ucfirst($title);
-    }
+		// Remove double space.
+		$title = preg_replace('/\s+/', ' ', $title);
+		return ucfirst($title);
+	}
 
-    /**
-     * Remove extension of a file.
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function removeExtension($fileName)
-    {
-        $parts = explode('.', $fileName);
-        if (!empty($parts)) {
-            array_pop($parts);
-        }
-        return implode('.', $parts);
-    }
+	/**
+	 * Remove extension of a file.
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function removeExtension($fileName)
+	{
+		$parts = explode('.', $fileName);
+		if (!empty($parts)) {
+			array_pop($parts);
+		}
+		return implode('.', $parts);
+	}
 }

Classes/Form/FileUploadTceForms.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     {
         // Get the base prefix.
         $basePrefix = $this->getBasePrefix($this->getPrefix());
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
+        $filePath = ExtensionManagementUtility::extPath('media').'Resources/Private/Standalone/FileUploadTceForms.js';
 
         return sprintf(
             file_get_contents($filePath),

Indentation +46 added lines, -46 removed lines

@@ -20,56 +20,56 @@
  */
 class FileUploadTceForms extends FileUpload
 {
-    /**
-     * @var string
-     */
-    protected string $templateFile = 'Resources/Private/Standalone/FileUploadTceFormsTemplate.html';
+	/**
+	 * @var string
+	 */
+	protected string $templateFile = 'Resources/Private/Standalone/FileUploadTceFormsTemplate.html';
 
-    /**
-     * Fetch the JavaScript to be rendered and replace the markers with "live" variables.
-     */
-    protected function getJavaScript(): string
-    {
-        // Get the base prefix.
-        $basePrefix = $this->getBasePrefix($this->getPrefix());
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
+	/**
+	 * Fetch the JavaScript to be rendered and replace the markers with "live" variables.
+	 */
+	protected function getJavaScript(): string
+	{
+		// Get the base prefix.
+		$basePrefix = $this->getBasePrefix($this->getPrefix());
+		$filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
 
-        return sprintf(
-            file_get_contents($filePath),
-            $basePrefix,
-            $this->elementId,
-            $this->getModuleUrl(),
-            $this->getAllowedExtension(),
-            GeneralUtility::getMaxUploadFileSize() * 1024,
-            $this->getValue()
-        );
-    }
+		return sprintf(
+			file_get_contents($filePath),
+			$basePrefix,
+			$this->elementId,
+			$this->getModuleUrl(),
+			$this->getAllowedExtension(),
+			GeneralUtility::getMaxUploadFileSize() * 1024,
+			$this->getValue()
+		);
+	}
 
-    protected function getModuleUrl(): string
-    {
-        $moduleSignature = MediaModule::getSignature();
-        return BackendUtility::getModuleUrl($moduleSignature);
-    }
+	protected function getModuleUrl(): string
+	{
+		$moduleSignature = MediaModule::getSignature();
+		return BackendUtility::getModuleUrl($moduleSignature);
+	}
 
-    /**
-     * Get allowed extension.
-     */
-    protected function getAllowedExtension(): string
-    {
-        return $this->file->getExtension();
-    }
+	/**
+	 * Get allowed extension.
+	 */
+	protected function getAllowedExtension(): string
+	{
+		return $this->file->getExtension();
+	}
 
-    /**
-     * Returns additional file info.
-     */
-    protected function getFileInfo(): string
-    {
-        /** @var MetadataView $metadataView */
-        $metadataView = GeneralUtility::makeInstance(MetadataView::class);
+	/**
+	 * Returns additional file info.
+	 */
+	protected function getFileInfo(): string
+	{
+		/** @var MetadataView $metadataView */
+		$metadataView = GeneralUtility::makeInstance(MetadataView::class);
 
-        return sprintf(
-            '<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
-            $metadataView->render($this->file)
-        );
-    }
+		return sprintf(
+			'<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
+			$metadataView->render($this->file)
+		);
+	}
 }

Classes/Form/FileUpload.php

Spacing +5 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
     public function __construct()
     {
         $this->addLanguage();
-        $this->elementId = 'jquery-wrapped-fine-uploader-' . uniqid();
+        $this->elementId = 'jquery-wrapped-fine-uploader-'.uniqid();
 
         $this->template = <<<EOF
 <div class="control-group control-group-upload" style="%s">
@@ -72,7 +72,7 @@ 
     {
         /** @var PageRenderer $pageRenderer */
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media').'Resources/Private/Language/locallang.xlf', 'media_file_upload');
     }
 
     /**
@@ -155,7 +155,7 @@ 
         /** @var StandaloneView $view */
         $view = GeneralUtility::makeInstance(StandaloneView::class);
 
-        $templatePathAndFilename = ExtensionManagementUtility::extPath('media') . $this->templateFile;
+        $templatePathAndFilename = ExtensionManagementUtility::extPath('media').$this->templateFile;
         $view->setTemplatePathAndFilename($templatePathAndFilename);
 
         return $view;
@@ -171,7 +171,7 @@ 
         // Get the base prefix
         $basePrefix = $this->getBasePrefix($this->getPrefix());
 
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUpload.js';
+        $filePath = ExtensionManagementUtility::extPath('media').'Resources/Private/Standalone/FileUpload.js';
 
         return sprintf(
             file_get_contents($filePath),
@@ -181,8 +181,7 @@ 
             $this->getAllowedExtensions(),
             GeneralUtility::getMaxUploadFileSize() * 1024,
             $this->isDrivenByFolder() ?
-                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() :
-                $this->getMediaModule()->getCurrentStorage()->getUid() . ':/'
+                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() : $this->getMediaModule()->getCurrentStorage()->getUid().':/'
         );
     }
 

Indentation +206 added lines, -206 removed lines

@@ -28,24 +28,24 @@ 
  */
 class FileUpload extends AbstractFormField
 {
-    /**
-     * @var string
-     */
-    protected $elementId;
+	/**
+	 * @var string
+	 */
+	protected $elementId;
 
-    /**
-     * @var File
-     */
-    protected $file;
+	/**
+	 * @var File
+	 */
+	protected $file;
 
-    protected string $templateFile = 'Resources/Private/Standalone/FileUploadTemplate.html';
+	protected string $templateFile = 'Resources/Private/Standalone/FileUploadTemplate.html';
 
-    public function __construct()
-    {
-        $this->addLanguage();
-        $this->elementId = 'jquery-wrapped-fine-uploader-' . uniqid();
+	public function __construct()
+	{
+		$this->addLanguage();
+		$this->elementId = 'jquery-wrapped-fine-uploader-' . uniqid();
 
-        $this->template = <<<EOF
+		$this->template = <<<EOF
 <div class="control-group control-group-upload" style="%s">
     <div class="container-thumbnail">%s</div>
     %s
@@ -57,196 +57,196 @@ 
 </div>
 
 EOF;
-    }
-
-    /**
-     * Add language labels for JavaScript files
-     */
-    protected function addLanguage()
-    {
-        /** @var PageRenderer $pageRenderer */
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
-    }
-
-    /**
-     * Render a file upload field.
-     *
-     * @throws EmptyPropertyException
-     */
-    public function render(): string
-    {
-        // Instantiate the file object for the whole class if possible.
-        if ($this->getValue()) {
-            $this->file = $this->getResourceFactory()->getFileObject($this->getValue());
-        }
-
-        $result = sprintf(
-            $this->template,
-            $this->getInlineStyle(),
-            $this->getThumbnail(),
-            $this->getFileInfo(),
-            $this->elementId,
-            $this->getJavaScriptTemplate(),
-            $this->getJavaScript()
-        );
-        return $result;
-    }
-
-    protected function getInlineStyle(): string
-    {
-        $style = 'float: left';
-        if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
-            $style .= '; padding-left: 3px';
-        }
-        return $style;
-    }
-
-    /**
-     * Get the javascript from a file and replace the markers with live variables.
-     */
-    protected function getThumbnail(): string
-    {
-        $thumbnail = '';
-        if ($this->file) {
-            /** @var $thumbnailService \Fab\Media\Thumbnail\ThumbnailService */
-            $thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $this->file);
-            $thumbnail = $thumbnailService
-                ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
-                ->setAppendTimeStamp(true)
-                ->create();
-        }
-        return $thumbnail;
-    }
-
-    /**
-     * Get the javascript from a file and replace the markers with live variables.
-     */
-    protected function getJavaScriptTemplate(): string
-    {
-        $view = $this->getStandaloneView();
-        $view->assignMultiple(
-            array(
-                'maximumUploadLabel' => $this->getMaximumUploadLabel(),
-            )
-        );
-        return $view->render();
-    }
-
-    /**
-     * @return StandaloneView
-     */
-    protected function getStandaloneView()
-    {
-        /** @var StandaloneView $view */
-        $view = GeneralUtility::makeInstance(StandaloneView::class);
-
-        $templatePathAndFilename = ExtensionManagementUtility::extPath('media') . $this->templateFile;
-        $view->setTemplatePathAndFilename($templatePathAndFilename);
-
-        return $view;
-    }
-
-    /**
-     * Get the javascript from a file and replace the markers with live variables.
-     */
-    protected function getJavaScript(): string
-    {
-        // Get the base prefix
-        $basePrefix = $this->getBasePrefix($this->getPrefix());
-
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUpload.js';
-
-        return sprintf(
-            file_get_contents($filePath),
-            $basePrefix,
-            $this->elementId,
-            $this->getModuleUrl(),
-            $this->getAllowedExtensions(),
-            GeneralUtility::getMaxUploadFileSize() * 1024,
-            $this->isDrivenByFolder() ?
-                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() :
-                $this->getMediaModule()->getCurrentStorage()->getUid() . ':/'
-        );
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isDrivenByFolder()
-    {
-        return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
-    }
-
-    /**
-     */
-    protected function getModuleUrl(): string
-    {
-        $moduleSignature = MediaModule::getSignature();
-        return BackendUtility::getModuleUrl($moduleSignature);
-    }
-
-    /**
-     * Returns the max upload file size in Mo.
-     *
-     */
-    protected function getMaximumUploadLabel(): string
-    {
-        $result = round(GeneralUtility::getMaxUploadFileSize() / 1024, 2);
-        $label = LocalizationUtility::translate('max_upload_file', 'media');
-        $result = sprintf($label, $result);
-        return $result;
-    }
-
-    /**
-     * Get allowed extension.
-     *
-     */
-    protected function getAllowedExtensions(): string
-    {
-        return implode("','", PermissionUtility::getInstance()->getAllowedExtensions());
-    }
-
-    /**
-     * Compute the base prefix by removing the square brackets.
-     *
-     * @param string $prefix
-     */
-    protected function getBasePrefix($prefix): string
-    {
-        $parts = explode('[', $prefix);
-        return empty($parts) ? '' : $parts[0];
-    }
-
-    /**
-     * Returns additional file info.
-     *
-     */
-    protected function getFileInfo(): string
-    {
-        return ''; // empty return here but check out Tceforms/FileUpload
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	}
+
+	/**
+	 * Add language labels for JavaScript files
+	 */
+	protected function addLanguage()
+	{
+		/** @var PageRenderer $pageRenderer */
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+	}
+
+	/**
+	 * Render a file upload field.
+	 *
+	 * @throws EmptyPropertyException
+	 */
+	public function render(): string
+	{
+		// Instantiate the file object for the whole class if possible.
+		if ($this->getValue()) {
+			$this->file = $this->getResourceFactory()->getFileObject($this->getValue());
+		}
+
+		$result = sprintf(
+			$this->template,
+			$this->getInlineStyle(),
+			$this->getThumbnail(),
+			$this->getFileInfo(),
+			$this->elementId,
+			$this->getJavaScriptTemplate(),
+			$this->getJavaScript()
+		);
+		return $result;
+	}
+
+	protected function getInlineStyle(): string
+	{
+		$style = 'float: left';
+		if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
+			$style .= '; padding-left: 3px';
+		}
+		return $style;
+	}
+
+	/**
+	 * Get the javascript from a file and replace the markers with live variables.
+	 */
+	protected function getThumbnail(): string
+	{
+		$thumbnail = '';
+		if ($this->file) {
+			/** @var $thumbnailService \Fab\Media\Thumbnail\ThumbnailService */
+			$thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $this->file);
+			$thumbnail = $thumbnailService
+				->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
+				->setAppendTimeStamp(true)
+				->create();
+		}
+		return $thumbnail;
+	}
+
+	/**
+	 * Get the javascript from a file and replace the markers with live variables.
+	 */
+	protected function getJavaScriptTemplate(): string
+	{
+		$view = $this->getStandaloneView();
+		$view->assignMultiple(
+			array(
+				'maximumUploadLabel' => $this->getMaximumUploadLabel(),
+			)
+		);
+		return $view->render();
+	}
+
+	/**
+	 * @return StandaloneView
+	 */
+	protected function getStandaloneView()
+	{
+		/** @var StandaloneView $view */
+		$view = GeneralUtility::makeInstance(StandaloneView::class);
+
+		$templatePathAndFilename = ExtensionManagementUtility::extPath('media') . $this->templateFile;
+		$view->setTemplatePathAndFilename($templatePathAndFilename);
+
+		return $view;
+	}
+
+	/**
+	 * Get the javascript from a file and replace the markers with live variables.
+	 */
+	protected function getJavaScript(): string
+	{
+		// Get the base prefix
+		$basePrefix = $this->getBasePrefix($this->getPrefix());
+
+		$filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUpload.js';
+
+		return sprintf(
+			file_get_contents($filePath),
+			$basePrefix,
+			$this->elementId,
+			$this->getModuleUrl(),
+			$this->getAllowedExtensions(),
+			GeneralUtility::getMaxUploadFileSize() * 1024,
+			$this->isDrivenByFolder() ?
+				$this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() :
+				$this->getMediaModule()->getCurrentStorage()->getUid() . ':/'
+		);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isDrivenByFolder()
+	{
+		return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
+	}
+
+	/**
+	 */
+	protected function getModuleUrl(): string
+	{
+		$moduleSignature = MediaModule::getSignature();
+		return BackendUtility::getModuleUrl($moduleSignature);
+	}
+
+	/**
+	 * Returns the max upload file size in Mo.
+	 *
+	 */
+	protected function getMaximumUploadLabel(): string
+	{
+		$result = round(GeneralUtility::getMaxUploadFileSize() / 1024, 2);
+		$label = LocalizationUtility::translate('max_upload_file', 'media');
+		$result = sprintf($label, $result);
+		return $result;
+	}
+
+	/**
+	 * Get allowed extension.
+	 *
+	 */
+	protected function getAllowedExtensions(): string
+	{
+		return implode("','", PermissionUtility::getInstance()->getAllowedExtensions());
+	}
+
+	/**
+	 * Compute the base prefix by removing the square brackets.
+	 *
+	 * @param string $prefix
+	 */
+	protected function getBasePrefix($prefix): string
+	{
+		$parts = explode('[', $prefix);
+		return empty($parts) ? '' : $parts[0];
+	}
+
+	/**
+	 * Returns additional file info.
+	 *
+	 */
+	protected function getFileInfo(): string
+	{
+		return ''; // empty return here but check out Tceforms/FileUpload
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/TypeConverter/FileConverter.php

Indentation +37 added lines, -37 removed lines

@@ -20,47 +20,47 @@
  */
 class FileConverter extends AbstractTypeConverter
 {
-    /**
-     * @var array<string>
-     */
-    protected $sourceTypes = array('int');
+	/**
+	 * @var array<string>
+	 */
+	protected $sourceTypes = array('int');
 
-    /**
-     * @var string
-     */
-    protected $targetType = 'TYPO3\CMS\Core\Resource\File';
+	/**
+	 * @var string
+	 */
+	protected $targetType = 'TYPO3\CMS\Core\Resource\File';
 
-    /**
-     * @var integer
-     */
-    protected $priority = 1;
+	/**
+	 * @var integer
+	 */
+	protected $priority = 1;
 
-    /**
-     * Actually convert from $source to $targetType
-     *
-     * @param string $source
-     * @param string $targetType
-     * @param array $convertedChildProperties
-     * @param PropertyMappingConfigurationInterface $configuration
-     * @return File
-     * @api
-     */
-    public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
-    {
-        /** @var $file File */
-        $file = $this->getResourceFactory()->getFileObject((int)$source);
+	/**
+	 * Actually convert from $source to $targetType
+	 *
+	 * @param string $source
+	 * @param string $targetType
+	 * @param array $convertedChildProperties
+	 * @param PropertyMappingConfigurationInterface $configuration
+	 * @return File
+	 * @api
+	 */
+	public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
+	{
+		/** @var $file File */
+		$file = $this->getResourceFactory()->getFileObject((int)$source);
 
-        if (!$file) {
-            $message = sprintf('File with identifier "%s" could not be found.', $file);
-            throw new \Exception($message, 1433529796);
-        }
+		if (!$file) {
+			$message = sprintf('File with identifier "%s" could not be found.', $file);
+			throw new \Exception($message, 1433529796);
+		}
 
-        $file->getType(); // force to internally know its mime-type.
-        return $file;
-    }
+		$file->getType(); // force to internally know its mime-type.
+		return $file;
+	}
 
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/TypeConverter/ContentToFileConverter.php

Indentation +26 added lines, -26 removed lines

@@ -20,33 +20,33 @@
  */
 class ContentToFileConverter implements SingletonInterface
 {
-    /**
-     * Convert a file representation to File Resource.
-     *
-     * @param Content|int $fileRepresentation
-     * @throws \RuntimeException
-     * @return File
-     */
-    public function convert($fileRepresentation)
-    {
-        if ($fileRepresentation instanceof Content) {
-            $fileData = $fileRepresentation->toArray();
-            $fileData['modification_date'] = $fileData['tstamp'];
+	/**
+	 * Convert a file representation to File Resource.
+	 *
+	 * @param Content|int $fileRepresentation
+	 * @throws \RuntimeException
+	 * @return File
+	 */
+	public function convert($fileRepresentation)
+	{
+		if ($fileRepresentation instanceof Content) {
+			$fileData = $fileRepresentation->toArray();
+			$fileData['modification_date'] = $fileData['tstamp'];
 
-            if (!isset($fileData['storage']) && $fileData['storage'] === null) {
-                throw new \RuntimeException('Storage identifier can not be null.', 1379946981);
-            }
+			if (!isset($fileData['storage']) && $fileData['storage'] === null) {
+				throw new \RuntimeException('Storage identifier can not be null.', 1379946981);
+			}
 
-            $fileUid = $fileData['uid'];
-        } else {
-            $fileData = [];
-            $fileUid = (int)$fileRepresentation;
-        }
-        return $this->getResourceFactory()->getFileObject($fileUid, $fileData);
-    }
+			$fileUid = $fileData['uid'];
+		} else {
+			$fileData = [];
+			$fileUid = (int)$fileRepresentation;
+		}
+		return $this->getResourceFactory()->getFileObject($fileUid, $fileData);
+	}
 
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Tool/DuplicateFilesFinderTool.php

Indentation +195 added lines, -195 removed lines

@@ -24,199 +24,199 @@
  */
 class DuplicateFilesFinderTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find duplicate Files';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('isAdmin', $this->getBackendUser()->isAdmin());
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-        // Possible clean up of missing files if the User has clicked so.
-        if (!empty($arguments['deleteDuplicateFiles'])) {
-            $this->deleteMissingFilesAction($arguments['files']);
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $duplicateFilesReports = [];
-
-        if ($this->getBackendUser()->isAdmin()) {
-            foreach ($this->getStorageRepository()->findAll() as $storage) {
-                if ($storage->isOnline()) {
-                    $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
-                    $duplicateFilesReports[] = array(
-                        'storage' => $storage,
-                        'duplicateFiles' => $duplicateFiles,
-                        'numberOfDuplicateFiles' => count($duplicateFiles),
-                    );
-                }
-            }
-        } else {
-            $fileMounts = $this->getBackendUser()->getFileMountRecords();
-
-            $allowedStorages = [];
-            foreach ($fileMounts as $fileMount) {
-                if ((bool)$fileMount['read_only']) {
-                    continue;
-                }
-
-                if (!isset($allowedStorages[$fileMount['base']])) {
-                    $allowedStorages[$fileMount['base']] = [];
-                }
-                if (!in_array($fileMount['base'], $allowedStorages)) {
-                    $allowedStorages[$fileMount['base']][] = $fileMount['path'];
-                }
-            }
-
-            foreach ($allowedStorages as $storageIdentifier => $allowedMountPoints) {
-                $storage = $this->getResourceFactory()->getStorageObject($storageIdentifier);
-
-                if ($storage->isOnline()) {
-                    $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
-
-                    // Filter duplicates files
-                    foreach ($duplicateFiles as $key => $files) {
-                        $filteredFiles = [];
-                        foreach ($files as $file) {
-                            foreach ($allowedMountPoints as $allowedMountPoint) {
-                                $pattern = '%^' . $allowedMountPoint . '%isU';
-                                if (preg_match($pattern, $file['identifier'])) {
-                                    $filteredFiles[] = $file;
-                                    break; // no need to further loop around, stop the loop.
-                                }
-                            }
-                        }
-
-                        // We need more than 1 files to be shown as duplicate.
-                        if (count($filteredFiles) > 1) {
-                            $duplicateFiles[$key] = $filteredFiles;
-                        } else {
-                            unset($duplicateFiles[$key]);
-                        }
-                    }
-                    $duplicateFilesReports[] = array(
-                        'storage' => $storage,
-                        'duplicateFiles' => $duplicateFiles,
-                        'numberOfDuplicateFiles' => count($duplicateFiles),
-                    );
-                }
-            }
-        }
-
-        $view->assign('duplicateFilesReports', $duplicateFilesReports);
-
-        return $view->render();
-    }
-
-    /**
-     * Delete files given as parameter.
-     * This is a special case as we have a missing file in the file system
-     * As a result, we can't use $fileObject->delete(); which will
-     * raise exception "Error while fetching permissions".
-     *
-     * @param array $files
-     * @return void
-     */
-    protected function deleteMissingFilesAction(array $files = [])
-    {
-        foreach ($files as $fileUid) {
-            /** @var File $file */
-            try {
-                $file = $this->getResourceFactory()->getFileObject($fileUid);
-                if ($file->exists()) {
-                    $numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
-                    if ($numberOfReferences === 0) {
-                        $file->delete();
-                    }
-                } else {
-                    $this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(IndexAnalyser::class);
-    }
-
-    /**
-     * @return ThumbnailGenerator|object
-     */
-    protected function getThumbnailGenerator()
-    {
-        return GeneralUtility::makeInstance(ThumbnailGenerator::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return true;
-    }
-
-    /**
-     * @return FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(FileReferenceService::class);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find duplicate Files';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('isAdmin', $this->getBackendUser()->isAdmin());
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+		// Possible clean up of missing files if the User has clicked so.
+		if (!empty($arguments['deleteDuplicateFiles'])) {
+			$this->deleteMissingFilesAction($arguments['files']);
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$duplicateFilesReports = [];
+
+		if ($this->getBackendUser()->isAdmin()) {
+			foreach ($this->getStorageRepository()->findAll() as $storage) {
+				if ($storage->isOnline()) {
+					$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
+					$duplicateFilesReports[] = array(
+						'storage' => $storage,
+						'duplicateFiles' => $duplicateFiles,
+						'numberOfDuplicateFiles' => count($duplicateFiles),
+					);
+				}
+			}
+		} else {
+			$fileMounts = $this->getBackendUser()->getFileMountRecords();
+
+			$allowedStorages = [];
+			foreach ($fileMounts as $fileMount) {
+				if ((bool)$fileMount['read_only']) {
+					continue;
+				}
+
+				if (!isset($allowedStorages[$fileMount['base']])) {
+					$allowedStorages[$fileMount['base']] = [];
+				}
+				if (!in_array($fileMount['base'], $allowedStorages)) {
+					$allowedStorages[$fileMount['base']][] = $fileMount['path'];
+				}
+			}
+
+			foreach ($allowedStorages as $storageIdentifier => $allowedMountPoints) {
+				$storage = $this->getResourceFactory()->getStorageObject($storageIdentifier);
+
+				if ($storage->isOnline()) {
+					$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
+
+					// Filter duplicates files
+					foreach ($duplicateFiles as $key => $files) {
+						$filteredFiles = [];
+						foreach ($files as $file) {
+							foreach ($allowedMountPoints as $allowedMountPoint) {
+								$pattern = '%^' . $allowedMountPoint . '%isU';
+								if (preg_match($pattern, $file['identifier'])) {
+									$filteredFiles[] = $file;
+									break; // no need to further loop around, stop the loop.
+								}
+							}
+						}
+
+						// We need more than 1 files to be shown as duplicate.
+						if (count($filteredFiles) > 1) {
+							$duplicateFiles[$key] = $filteredFiles;
+						} else {
+							unset($duplicateFiles[$key]);
+						}
+					}
+					$duplicateFilesReports[] = array(
+						'storage' => $storage,
+						'duplicateFiles' => $duplicateFiles,
+						'numberOfDuplicateFiles' => count($duplicateFiles),
+					);
+				}
+			}
+		}
+
+		$view->assign('duplicateFilesReports', $duplicateFilesReports);
+
+		return $view->render();
+	}
+
+	/**
+	 * Delete files given as parameter.
+	 * This is a special case as we have a missing file in the file system
+	 * As a result, we can't use $fileObject->delete(); which will
+	 * raise exception "Error while fetching permissions".
+	 *
+	 * @param array $files
+	 * @return void
+	 */
+	protected function deleteMissingFilesAction(array $files = [])
+	{
+		foreach ($files as $fileUid) {
+			/** @var File $file */
+			try {
+				$file = $this->getResourceFactory()->getFileObject($fileUid);
+				if ($file->exists()) {
+					$numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
+					if ($numberOfReferences === 0) {
+						$file->delete();
+					}
+				} else {
+					$this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(IndexAnalyser::class);
+	}
+
+	/**
+	 * @return ThumbnailGenerator|object
+	 */
+	protected function getThumbnailGenerator()
+	{
+		return GeneralUtility::makeInstance(ThumbnailGenerator::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return true;
+	}
+
+	/**
+	 * @return FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(FileReferenceService::class);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
         $view->assign('isAdmin', $this->getBackendUser()->isAdmin());
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -105,7 +105,7 @@ 
                         $filteredFiles = [];
                         foreach ($files as $file) {
                             foreach ($allowedMountPoints as $allowedMountPoint) {
-                                $pattern = '%^' . $allowedMountPoint . '%isU';
+                                $pattern = '%^'.$allowedMountPoint.'%isU';
                                 if (preg_match($pattern, $file['identifier'])) {
                                     $filteredFiles[] = $file;
                                     break; // no need to further loop around, stop the loop.