fabarea / media

Classes/Command/ThumbnailCommand.php

Indentation +106 added lines, -106 removed lines

@@ -21,110 +21,110 @@
 
 class ThumbnailCommand extends Command
 {
-    protected SymfonyStyle $io;
-
-    protected function initialize(InputInterface $input, OutputInterface $output)
-    {
-        $this->io = new SymfonyStyle($input, $output);
-    }
-
-    protected function configure()
-    {
-        $this
-            ->addOption(
-                'limit',
-                '',
-                InputOption::VALUE_REQUIRED,
-                'where to stop in the batch processing.',
-                0
-            )
-            ->addOption(
-                'offset',
-                '',
-                InputOption::VALUE_REQUIRED,
-                'where to start in the batch processing.',
-                0
-            )
-            ->addOption(
-                'configuration',
-                '',
-                InputOption::VALUE_REQUIRED,
-                'override the default thumbnail configuration.',
-                []
-            );
-    }
-
-    /**
-     * Generate a bunch of thumbnails in advance to speed up the output of the Media BE module.
-     */
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $limit = $input->getOption('limit');
-        $offset = $input->getOption('offset');
-        $configuration = $input->getOption('configuration');
-        $verbose = $input->getOption('verbose');
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-            $this->io->info(sprintf('Processing files from storage %s (%s)', $storage->getName(), $storage->getUid()));
-
-            if ($storage->isOnline()) {
-                // For the CLI cause.
-                $storage->setEvaluatePermissions(false);
-
-                $thumbnailGenerator = $this->getThumbnailGenerator();
-                $thumbnailGenerator
-                    ->setStorage($storage)
-                    ->setConfiguration($configuration)
-                    ->generate($limit, $offset);
-
-                if ($verbose) {
-                    $resultSet = $thumbnailGenerator->getResultSet();
-                    foreach ($resultSet as $result) {
-                        $message = sprintf(
-                            '* File "%s": %s %s',
-                            $result['fileUid'],
-                            $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
-                        );
-                        $this->io->info($message);
-                    }
-                }
-
-                $message = sprintf(
-                    'Done! New generated %s thumbnail(s) from %s traversed file(s) of a total of %s files.',
-                    $thumbnailGenerator->getNumberOfProcessedFiles(),
-                    $thumbnailGenerator->getNumberOfTraversedFiles(),
-                    $thumbnailGenerator->getTotalNumberOfFiles()
-                );
-                $this->io->info($message);
-
-                // Add warning message if missing files were found along the way.
-                if ($thumbnailGenerator->getNumberOfMissingFiles() > 0) {
-                    $message = sprintf(
-                        'ATTENTION! %s missing file(s) detected.',
-                        $thumbnailGenerator->getNumberOfMissingFiles()
-                    );
-                    $this->io->warning($message);
-                }
-            } else {
-                $this->io->info('Storage is offline!');
-            }
-        }
-        return 0;
-    }
-
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    protected function getThumbnailGenerator(): ThumbnailGenerator
-    {
-        return GeneralUtility::makeInstance(ThumbnailGenerator::class);
-    }
-
-    protected function getStorageRepository(): StorageRepository
-    {
-        return GeneralUtility::makeInstance(StorageRepository::class);
-    }
+	protected SymfonyStyle $io;
+
+	protected function initialize(InputInterface $input, OutputInterface $output)
+	{
+		$this->io = new SymfonyStyle($input, $output);
+	}
+
+	protected function configure()
+	{
+		$this
+			->addOption(
+				'limit',
+				'',
+				InputOption::VALUE_REQUIRED,
+				'where to stop in the batch processing.',
+				0
+			)
+			->addOption(
+				'offset',
+				'',
+				InputOption::VALUE_REQUIRED,
+				'where to start in the batch processing.',
+				0
+			)
+			->addOption(
+				'configuration',
+				'',
+				InputOption::VALUE_REQUIRED,
+				'override the default thumbnail configuration.',
+				[]
+			);
+	}
+
+	/**
+	 * Generate a bunch of thumbnails in advance to speed up the output of the Media BE module.
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int
+	{
+		$limit = $input->getOption('limit');
+		$offset = $input->getOption('offset');
+		$configuration = $input->getOption('configuration');
+		$verbose = $input->getOption('verbose');
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+			$this->io->info(sprintf('Processing files from storage %s (%s)', $storage->getName(), $storage->getUid()));
+
+			if ($storage->isOnline()) {
+				// For the CLI cause.
+				$storage->setEvaluatePermissions(false);
+
+				$thumbnailGenerator = $this->getThumbnailGenerator();
+				$thumbnailGenerator
+					->setStorage($storage)
+					->setConfiguration($configuration)
+					->generate($limit, $offset);
+
+				if ($verbose) {
+					$resultSet = $thumbnailGenerator->getResultSet();
+					foreach ($resultSet as $result) {
+						$message = sprintf(
+							'* File "%s": %s %s',
+							$result['fileUid'],
+							$result['fileIdentifier'],
+							empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+						);
+						$this->io->info($message);
+					}
+				}
+
+				$message = sprintf(
+					'Done! New generated %s thumbnail(s) from %s traversed file(s) of a total of %s files.',
+					$thumbnailGenerator->getNumberOfProcessedFiles(),
+					$thumbnailGenerator->getNumberOfTraversedFiles(),
+					$thumbnailGenerator->getTotalNumberOfFiles()
+				);
+				$this->io->info($message);
+
+				// Add warning message if missing files were found along the way.
+				if ($thumbnailGenerator->getNumberOfMissingFiles() > 0) {
+					$message = sprintf(
+						'ATTENTION! %s missing file(s) detected.',
+						$thumbnailGenerator->getNumberOfMissingFiles()
+					);
+					$this->io->warning($message);
+				}
+			} else {
+				$this->io->info('Storage is offline!');
+			}
+		}
+		return 0;
+	}
+
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	protected function getThumbnailGenerator(): ThumbnailGenerator
+	{
+		return GeneralUtility::makeInstance(ThumbnailGenerator::class);
+	}
+
+	protected function getStorageRepository(): StorageRepository
+	{
+		return GeneralUtility::makeInstance(StorageRepository::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
                             '* File "%s": %s %s',
                             $result['fileUid'],
                             $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+                            empty($result['thumbnailUri']) ? '' : ' -> '.$result['thumbnailUri']
                         );
                         $this->io->info($message);
                     }

Classes/Command/FileCacheFlushProcessedFilesCommand.php

Indentation +65 added lines, -65 removed lines

@@ -25,69 +25,69 @@
 
 class FileCacheFlushProcessedFilesCommand extends Command
 {
-    protected SymfonyStyle $io;
-
-    protected function initialize(InputInterface $input, OutputInterface $output)
-    {
-        $this->io = new SymfonyStyle($input, $output);
-    }
-
-    /**
-     * Flush all processed files to be used for debugging mainly.
-     */
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-            // This only works for local driver
-            if ($storage->getDriverType() === 'Local' && $storage->isOnline()) {
-                $processedDirectoryPath = Environment::getPublicPath() . $this->getProcessingFolderPath($storage);
-                $this->io->info(sprintf('Removing files from %s for storage "%s" (%s)', $processedDirectoryPath, $storage->getName(), $storage->getUid()));
-
-                $this->clearProcessedFiles($storage->getUid());
-
-                GeneralUtility::rmdir($processedDirectoryPath, true);
-                GeneralUtility::mkdir($processedDirectoryPath); // recreate the directory.
-
-                $message = sprintf('Done! Removed all processed files from storage %s.', $storage->getUid());
-                $this->io->info($message);
-            }
-        }
-
-        return 0;
-    }
-
-    public function clearProcessedFiles(int $storageUid): int
-    {
-        $repository = GeneralUtility::makeInstance(ProcessedFileRepository::class);
-        return $repository->removeAll($storageUid);
-    }
-
-    protected function getProcessingFolderPath(ResourceStorage $storage): string
-    {
-        $storageConfiguration = $storage->getConfiguration();
-        $storageBasePath = rtrim($storageConfiguration['basePath'], '/');
-        return '/' . $storageBasePath . $storage->getProcessingFolder()->getIdentifier();
-    }
-
-    protected function getCacheService(): CacheService
-    {
-        return GeneralUtility::makeInstance(CacheService::class);
-    }
-
-    protected function getStorageRepository(): StorageRepository
-    {
-        return GeneralUtility::makeInstance(StorageRepository::class);
-    }
-
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    protected function getConnection(string $tableName): Connection
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getConnectionForTable($tableName);
-    }
+	protected SymfonyStyle $io;
+
+	protected function initialize(InputInterface $input, OutputInterface $output)
+	{
+		$this->io = new SymfonyStyle($input, $output);
+	}
+
+	/**
+	 * Flush all processed files to be used for debugging mainly.
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int
+	{
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+			// This only works for local driver
+			if ($storage->getDriverType() === 'Local' && $storage->isOnline()) {
+				$processedDirectoryPath = Environment::getPublicPath() . $this->getProcessingFolderPath($storage);
+				$this->io->info(sprintf('Removing files from %s for storage "%s" (%s)', $processedDirectoryPath, $storage->getName(), $storage->getUid()));
+
+				$this->clearProcessedFiles($storage->getUid());
+
+				GeneralUtility::rmdir($processedDirectoryPath, true);
+				GeneralUtility::mkdir($processedDirectoryPath); // recreate the directory.
+
+				$message = sprintf('Done! Removed all processed files from storage %s.', $storage->getUid());
+				$this->io->info($message);
+			}
+		}
+
+		return 0;
+	}
+
+	public function clearProcessedFiles(int $storageUid): int
+	{
+		$repository = GeneralUtility::makeInstance(ProcessedFileRepository::class);
+		return $repository->removeAll($storageUid);
+	}
+
+	protected function getProcessingFolderPath(ResourceStorage $storage): string
+	{
+		$storageConfiguration = $storage->getConfiguration();
+		$storageBasePath = rtrim($storageConfiguration['basePath'], '/');
+		return '/' . $storageBasePath . $storage->getProcessingFolder()->getIdentifier();
+	}
+
+	protected function getCacheService(): CacheService
+	{
+		return GeneralUtility::makeInstance(CacheService::class);
+	}
+
+	protected function getStorageRepository(): StorageRepository
+	{
+		return GeneralUtility::makeInstance(StorageRepository::class);
+	}
+
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	protected function getConnection(string $tableName): Connection
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getConnectionForTable($tableName);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         foreach ($this->getStorageRepository()->findAll() as $storage) {
             // This only works for local driver
             if ($storage->getDriverType() === 'Local' && $storage->isOnline()) {
-                $processedDirectoryPath = Environment::getPublicPath() . $this->getProcessingFolderPath($storage);
+                $processedDirectoryPath = Environment::getPublicPath().$this->getProcessingFolderPath($storage);
                 $this->io->info(sprintf('Removing files from %s for storage "%s" (%s)', $processedDirectoryPath, $storage->getName(), $storage->getUid()));
 
                 $this->clearProcessedFiles($storage->getUid());
@@ -66,7 +66,7 @@ 
     {
         $storageConfiguration = $storage->getConfiguration();
         $storageBasePath = rtrim($storageConfiguration['basePath'], '/');
-        return '/' . $storageBasePath . $storage->getProcessingFolder()->getIdentifier();
+        return '/'.$storageBasePath.$storage->getProcessingFolder()->getIdentifier();
     }
 
     protected function getCacheService(): CacheService

Classes/Domain/Validator/StorageValidator.php

Indentation +29 added lines, -29 removed lines

@@ -19,36 +19,36 @@
  */
 class StorageValidator extends AbstractValidator
 {
-    /**
-     * Check if $storageIdentifier is allowed. If it is not valid, throw an exception.
-     *
-     * @param int $combinedIdentifier
-     * @return void
-     */
-    public function isValid($combinedIdentifier)
-    {
-        $allowedStorageIdentifiers = [];
-        foreach ($this->getMediaModule()->getAllowedStorages() as $allowedStorage) {
-            $allowedStorageIdentifiers[] = $allowedStorage->getUid();
-        }
+	/**
+	 * Check if $storageIdentifier is allowed. If it is not valid, throw an exception.
+	 *
+	 * @param int $combinedIdentifier
+	 * @return void
+	 */
+	public function isValid($combinedIdentifier)
+	{
+		$allowedStorageIdentifiers = [];
+		foreach ($this->getMediaModule()->getAllowedStorages() as $allowedStorage) {
+			$allowedStorageIdentifiers[] = $allowedStorage->getUid();
+		}
 
-        $storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-        if (!in_array($storage->getUid(), $allowedStorageIdentifiers)) {
-            $message = sprintf('Storage identifier "%s" is not allowed or is currently off-line.', $combinedIdentifier);
-            $this->addError($message, 1380813503);
-        }
-    }
+		$storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+		if (!in_array($storage->getUid(), $allowedStorageIdentifiers)) {
+			$message = sprintf('Storage identifier "%s" is not allowed or is currently off-line.', $combinedIdentifier);
+			$this->addError($message, 1380813503);
+		}
+	}
 
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Property/TypeConverter/ConfigurationArrayConverter.php

Indentation +80 added lines, -80 removed lines

@@ -17,11 +17,11 @@ 
  */
 class ConfigurationArrayConverter extends ArrayConverter
 {
-    /**
-     * Match configuration options (to parse actual options)
-     * @var string
-     */
-    public const PATTERN_MATCH_CONFIGURATIONOPTIONS = '/
+	/**
+	 * Match configuration options (to parse actual options)
+	 * @var string
+	 */
+	public const PATTERN_MATCH_CONFIGURATIONOPTIONS = '/
 			\s*
 			(?P<optionName>[a-z0-9]+)
 			\s*=\s*
@@ -32,84 +32,84 @@ 
 			)
 		/ixS';
 
-    /**
-     * We can only convert empty strings to array or array to array.
-     *
-     * @param mixed $source
-     * @param string $targetType
-     * @return boolean
-     */
-    public function canConvertFrom($source, string $targetType): bool
-    {
-        return is_string($source) || is_array($source);
-    }
+	/**
+	 * We can only convert empty strings to array or array to array.
+	 *
+	 * @param mixed $source
+	 * @param string $targetType
+	 * @return boolean
+	 */
+	public function canConvertFrom($source, string $targetType): bool
+	{
+		return is_string($source) || is_array($source);
+	}
 
-    /**
-     * Convert from $source to $targetType, a noop if the source is an array.
-     * If it is an empty string it will be converted to an empty array.
-     *
-     * @param string|array $source
-     * @param string $targetType
-     * @param array $convertedChildProperties
-     * @param PropertyMappingConfigurationInterface $configuration
-     * @return array
-     * @api
-     */
-    public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
-    {
-        if (is_string($source)) {
-            if ($source === '') {
-                $target = [];
-            } else {
-                $target = $this->parseConfigurationOptions($source);
-            }
-        }
+	/**
+	 * Convert from $source to $targetType, a noop if the source is an array.
+	 * If it is an empty string it will be converted to an empty array.
+	 *
+	 * @param string|array $source
+	 * @param string $targetType
+	 * @param array $convertedChildProperties
+	 * @param PropertyMappingConfigurationInterface $configuration
+	 * @return array
+	 * @api
+	 */
+	public function convertFrom($source, $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null)
+	{
+		if (is_string($source)) {
+			if ($source === '') {
+				$target = [];
+			} else {
+				$target = $this->parseConfigurationOptions($source);
+			}
+		}
 
-        if (is_array($source)) {
-            $target = $source;
-        }
+		if (is_array($source)) {
+			$target = $source;
+		}
 
-        return $target;
-    }
+		return $target;
+	}
 
-    /**
-     * Parses $rawValidatorOptions not containing quoted option values.
-     * $rawValidatorOptions will be an empty string afterwards (pass by ref!).
-     *
-     * @param string $rawValidatorOptions
-     * @return array An array of optionName/optionValue pairs
-     */
-    protected function parseConfigurationOptions($rawConfigurationOptions)
-    {
-        $configurationOptions = [];
-        $parsedConfigurationOptions = [];
-        preg_match_all(self::PATTERN_MATCH_CONFIGURATIONOPTIONS, $rawConfigurationOptions, $configurationOptions, PREG_SET_ORDER);
-        foreach ($configurationOptions as $configurationOption) {
-            $parsedConfigurationOptions[trim($configurationOption['optionName'])] = trim($configurationOption['optionValue']);
-        }
-        array_walk($parsedConfigurationOptions, array($this, 'unquoteString'));
-        return $parsedConfigurationOptions;
-    }
+	/**
+	 * Parses $rawValidatorOptions not containing quoted option values.
+	 * $rawValidatorOptions will be an empty string afterwards (pass by ref!).
+	 *
+	 * @param string $rawValidatorOptions
+	 * @return array An array of optionName/optionValue pairs
+	 */
+	protected function parseConfigurationOptions($rawConfigurationOptions)
+	{
+		$configurationOptions = [];
+		$parsedConfigurationOptions = [];
+		preg_match_all(self::PATTERN_MATCH_CONFIGURATIONOPTIONS, $rawConfigurationOptions, $configurationOptions, PREG_SET_ORDER);
+		foreach ($configurationOptions as $configurationOption) {
+			$parsedConfigurationOptions[trim($configurationOption['optionName'])] = trim($configurationOption['optionValue']);
+		}
+		array_walk($parsedConfigurationOptions, array($this, 'unquoteString'));
+		return $parsedConfigurationOptions;
+	}
 
-    /**
-     * Removes escapings from a given argument string and trims the outermost
-     * quotes.
-     *
-     * This method is meant as a helper for regular expression results.
-     *
-     * @param string &$quotedValue Value to unquote
-     * @return void
-     */
-    protected function unquoteString(&$quotedValue)
-    {
-        switch ($quotedValue[0]) {
-            case '"':
-                $quotedValue = str_replace('\\"', '"', trim($quotedValue, '"'));
-                break;
-            case '\'':
-                $quotedValue = str_replace('\\\'', '\'', trim($quotedValue, '\''));
-                break;
-        }
-        $quotedValue = str_replace('\\\\', '\\', $quotedValue);
-    }
+	/**
+	 * Removes escapings from a given argument string and trims the outermost
+	 * quotes.
+	 *
+	 * This method is meant as a helper for regular expression results.
+	 *
+	 * @param string &$quotedValue Value to unquote
+	 * @return void
+	 */
+	protected function unquoteString(&$quotedValue)
+	{
+		switch ($quotedValue[0]) {
+			case '"':
+				$quotedValue = str_replace('\\"', '"', trim($quotedValue, '"'));
+				break;
+			case '\'':
+				$quotedValue = str_replace('\\\'', '\'', trim($quotedValue, '\''));
+				break;
+		}
+		$quotedValue = str_replace('\\\\', '\\', $quotedValue);
+	}
 }

Classes/Security/FilePermissionsAspect.php

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
                 if ($this->getMediaModule()->hasRecursiveSelection()) {
                     // Only add like condition if needed.
                     if ($folder->getStorage()->getRootLevelFolder() !== $folder) {
-                        $matcher->like('identifier', $folder->getIdentifier() . '%', $automaticallyAddWildCard = false);
+                        $matcher->like('identifier', $folder->getIdentifier().'%', $automaticallyAddWildCard = false);
                     }
                 } else {
                     // Browse only currently
@@ -66,7 +66,7 @@ 
                     $fileMounts = $this->getCurrentBackendUser()->getFileMountRecords();
                     $collectedFiles = [];
                     foreach ($fileMounts as $fileMount) {
-                        $combinedIdentifier = $fileMount['base'] . ':' . $fileMount['path'];
+                        $combinedIdentifier = $fileMount['base'].':'.$fileMount['path'];
                         $folder = $this->getResourceFactory()->getFolderObjectFromCombinedIdentifier($combinedIdentifier);
 
                         $files = $this->getFileUids($folder);
@@ -168,7 +168,7 @@ 
             if ($fileMountRecord['path']) {
                 $constraintsRespectingFileMounts[] = $query->like(
                     'identifier',
-                    $fileMountRecord['path'] . '%'
+                    $fileMountRecord['path'].'%'
                 );
             }
         }

Indentation +148 added lines, -148 removed lines

@@ -27,152 +27,152 @@
  */
 class FilePermissionsAspect
 {
-    /**
-     * Post-process the matcher object to respect the file storages.
-     */
-    public function addFilePermissionsForFileStorages(Matcher $matcher, string $dataType): void
-    {
-        if ($dataType === 'sys_file' && $this->isPermissionNecessary()) {
-            if ($this->isFolderConsidered()) {
-                $folder = $this->getMediaModule()->getCurrentFolder();
-
-                if ($this->getMediaModule()->hasRecursiveSelection()) {
-                    // Only add like condition if needed.
-                    if ($folder->getStorage()->getRootLevelFolder() !== $folder) {
-                        $matcher->like('identifier', $folder->getIdentifier() . '%', $automaticallyAddWildCard = false);
-                    }
-                } else {
-                    // Browse only currently
-                    $files = $this->getFileUids($folder);
-                    $matcher->in('uid', $files);
-                }
-
-                $matcher->equals('storage', $folder->getStorage()->getUid());
-            } else {
-                $storage = $this->getMediaModule()->getCurrentStorage();
-
-                // Set the storage identifier only if the storage is on-line.
-                $identifier = -1;
-                if ($storage->isOnline()) {
-                    $identifier = $storage->getUid();
-                }
-
-                if ($this->getModuleLoader()->hasPlugin() && !$this->getCurrentBackendUser()->isAdmin()) {
-                    $fileMounts = $this->getCurrentBackendUser()->getFileMountRecords();
-                    $collectedFiles = [];
-                    foreach ($fileMounts as $fileMount) {
-                        $combinedIdentifier = $fileMount['base'] . ':' . $fileMount['path'];
-                        $folder = $this->getResourceFactory()->getFolderObjectFromCombinedIdentifier($combinedIdentifier);
-
-                        $files = $this->getFileUids($folder);
-                        $collectedFiles = array_merge($collectedFiles, $files);
-                    }
-
-                    $matcher->in('uid', $collectedFiles);
-                }
-
-                $matcher->equals('storage', $identifier);
-            }
-        }
-    }
-
-    protected function isPermissionNecessary(): bool
-    {
-        $isNecessary = true;
-
-        $parameters = GeneralUtility::_GET(VidiModule::getParameterPrefix());
-
-        if ($parameters['controller'] === 'Clipboard' && ($parameters['action'] === 'show' || $parameters['action'] === 'flush')) {
-            $isNecessary = false;
-        }
-
-        if ($parameters['controller'] === 'Content' && ($parameters['action'] === 'copyClipboard' || $parameters['action'] === 'moveClipboard')) {
-            $isNecessary = false;
-        }
-
-        return $isNecessary;
-    }
-
-    protected function isFolderConsidered(): bool
-    {
-        return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
-    }
-
-    protected function getFileUids(Folder $folder): array
-    {
-        $files = [];
-        foreach ($folder->getFiles() as $file) {
-            $files[] = $file->getUid();
-        }
-        return $files;
-    }
-
-    /**
-     * Post-process the constraints object to respect the file mounts.
-     *
-     * @param ConstraintInterface|null $constraints
-     */
-    public function addFilePermissionsForFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer): void
-    {
-        if ($query->getType() === 'sys_file') {
-            if (!$this->getCurrentBackendUser()->isAdmin()) {
-                $this->respectFileMounts($query, $constraints, $constraintContainer);
-            }
-        }
-    }
-
-    /**
-     * @param ConstraintInterface|null $constraints
-     */
-    protected function respectFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer): array
-    {
-        // Get the file mount identifiers for the current Backend User.
-        $fileMountRecords = $this->getCurrentBackendUser()->getFileMountRecords();
-        $constraintsRespectingFileMounts = [];
-        foreach ((array)$fileMountRecords as $fileMountRecord) {
-            if ($fileMountRecord['path']) {
-                $constraintsRespectingFileMounts[] = $query->like(
-                    'identifier',
-                    $fileMountRecord['path'] . '%'
-                );
-            }
-        }
-
-        $logicalOrForRespectingFileMounts = $query->logicalOr($constraintsRespectingFileMounts);
-
-        if ($constraints) {
-            $constraints = $query->logicalAnd([$constraints, $logicalOrForRespectingFileMounts]);
-        } else {
-            $constraints = $logicalOrForRespectingFileMounts;
-        }
-
-        $constraintContainer->setConstraint($constraints);
-
-        return [$query, $constraints, $constraintContainer];
-    }
-
-    protected function getCurrentBackendUser(): BackendUserAuthentication
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    protected function getMediaModule(): MediaModule
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    protected function getModuleLoader(): ModuleLoader
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * Post-process the matcher object to respect the file storages.
+	 */
+	public function addFilePermissionsForFileStorages(Matcher $matcher, string $dataType): void
+	{
+		if ($dataType === 'sys_file' && $this->isPermissionNecessary()) {
+			if ($this->isFolderConsidered()) {
+				$folder = $this->getMediaModule()->getCurrentFolder();
+
+				if ($this->getMediaModule()->hasRecursiveSelection()) {
+					// Only add like condition if needed.
+					if ($folder->getStorage()->getRootLevelFolder() !== $folder) {
+						$matcher->like('identifier', $folder->getIdentifier() . '%', $automaticallyAddWildCard = false);
+					}
+				} else {
+					// Browse only currently
+					$files = $this->getFileUids($folder);
+					$matcher->in('uid', $files);
+				}
+
+				$matcher->equals('storage', $folder->getStorage()->getUid());
+			} else {
+				$storage = $this->getMediaModule()->getCurrentStorage();
+
+				// Set the storage identifier only if the storage is on-line.
+				$identifier = -1;
+				if ($storage->isOnline()) {
+					$identifier = $storage->getUid();
+				}
+
+				if ($this->getModuleLoader()->hasPlugin() && !$this->getCurrentBackendUser()->isAdmin()) {
+					$fileMounts = $this->getCurrentBackendUser()->getFileMountRecords();
+					$collectedFiles = [];
+					foreach ($fileMounts as $fileMount) {
+						$combinedIdentifier = $fileMount['base'] . ':' . $fileMount['path'];
+						$folder = $this->getResourceFactory()->getFolderObjectFromCombinedIdentifier($combinedIdentifier);
+
+						$files = $this->getFileUids($folder);
+						$collectedFiles = array_merge($collectedFiles, $files);
+					}
+
+					$matcher->in('uid', $collectedFiles);
+				}
+
+				$matcher->equals('storage', $identifier);
+			}
+		}
+	}
+
+	protected function isPermissionNecessary(): bool
+	{
+		$isNecessary = true;
+
+		$parameters = GeneralUtility::_GET(VidiModule::getParameterPrefix());
+
+		if ($parameters['controller'] === 'Clipboard' && ($parameters['action'] === 'show' || $parameters['action'] === 'flush')) {
+			$isNecessary = false;
+		}
+
+		if ($parameters['controller'] === 'Content' && ($parameters['action'] === 'copyClipboard' || $parameters['action'] === 'moveClipboard')) {
+			$isNecessary = false;
+		}
+
+		return $isNecessary;
+	}
+
+	protected function isFolderConsidered(): bool
+	{
+		return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
+	}
+
+	protected function getFileUids(Folder $folder): array
+	{
+		$files = [];
+		foreach ($folder->getFiles() as $file) {
+			$files[] = $file->getUid();
+		}
+		return $files;
+	}
+
+	/**
+	 * Post-process the constraints object to respect the file mounts.
+	 *
+	 * @param ConstraintInterface|null $constraints
+	 */
+	public function addFilePermissionsForFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer): void
+	{
+		if ($query->getType() === 'sys_file') {
+			if (!$this->getCurrentBackendUser()->isAdmin()) {
+				$this->respectFileMounts($query, $constraints, $constraintContainer);
+			}
+		}
+	}
+
+	/**
+	 * @param ConstraintInterface|null $constraints
+	 */
+	protected function respectFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer): array
+	{
+		// Get the file mount identifiers for the current Backend User.
+		$fileMountRecords = $this->getCurrentBackendUser()->getFileMountRecords();
+		$constraintsRespectingFileMounts = [];
+		foreach ((array)$fileMountRecords as $fileMountRecord) {
+			if ($fileMountRecord['path']) {
+				$constraintsRespectingFileMounts[] = $query->like(
+					'identifier',
+					$fileMountRecord['path'] . '%'
+				);
+			}
+		}
+
+		$logicalOrForRespectingFileMounts = $query->logicalOr($constraintsRespectingFileMounts);
+
+		if ($constraints) {
+			$constraints = $query->logicalAnd([$constraints, $logicalOrForRespectingFileMounts]);
+		} else {
+			$constraints = $logicalOrForRespectingFileMounts;
+		}
+
+		$constraintContainer->setConstraint($constraints);
+
+		return [$query, $constraints, $constraintContainer];
+	}
+
+	protected function getCurrentBackendUser(): BackendUserAuthentication
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	protected function getMediaModule(): MediaModule
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	protected function getModuleLoader(): ModuleLoader
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Hook/FileUploadHook.php

Indentation +33 added lines, -33 removed lines

@@ -20,39 +20,39 @@
  */
 class FileUploadHook implements ExtendedFileUtilityProcessDataHookInterface
 {
-    /**
-     * @param string $action The action
-     * @param array $cmdArr The parameter sent to the action handler
-     * @param array $result The results of all calls to the action handler
-     * @param ExtendedFileUtility $pObj The parent object
-     * @return void
-     */
-    public function processData_postProcessAction($action, array $cmdArr, array $result, ExtendedFileUtility $pObj)
-    {
-        if ($action === 'upload') {
-            /** @var File[] $files */
-            $files = array_pop($result);
-            if (!is_array($files)) {
-                return;
-            }
+	/**
+	 * @param string $action The action
+	 * @param array $cmdArr The parameter sent to the action handler
+	 * @param array $result The results of all calls to the action handler
+	 * @param ExtendedFileUtility $pObj The parent object
+	 * @return void
+	 */
+	public function processData_postProcessAction($action, array $cmdArr, array $result, ExtendedFileUtility $pObj)
+	{
+		if ($action === 'upload') {
+			/** @var File[] $files */
+			$files = array_pop($result);
+			if (!is_array($files)) {
+				return;
+			}
 
-            foreach ($files as $file) {
-                // Run the indexer for extracting metadata.
-                $this->getMediaIndexer($file->getStorage())
-                    ->extractMetadata($file)
-                    ->applyDefaultCategories($file);
-            }
-        }
-    }
+			foreach ($files as $file) {
+				// Run the indexer for extracting metadata.
+				$this->getMediaIndexer($file->getStorage())
+					->extractMetadata($file)
+					->applyDefaultCategories($file);
+			}
+		}
+	}
 
-    /**
-     * Get the instance of the Indexer service to update the metadata of the file.
-     *
-     * @param ResourceStorage $storage
-     * @return MediaIndexer|object
-     */
-    protected function getMediaIndexer($storage)
-    {
-        return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
-    }
+	/**
+	 * Get the instance of the Indexer service to update the metadata of the file.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return MediaIndexer|object
+	 */
+	protected function getMediaIndexer($storage)
+	{
+		return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
+	}
 }

ext_localconf.php

Indentation +31 added lines, -31 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 use TYPO3\CMS\Backend\Form\FormResultCompiler;
 defined('TYPO3') or die();
 
-call_user_func(function () {
+call_user_func(function() {
     $configuration = GeneralUtility::makeInstance(
         ExtensionConfiguration::class
     )->get('media');

Configuration/TCA/Overrides/sys_file_metadata.php

Indentation +24 added lines, -24 removed lines

@@ -4,36 +4,36 @@
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 
 if (!defined('TYPO3')) {
-    die('Access denied.');
+	die('Access denied.');
 }
 
 // We only want to have file relations if extension File advanced metadata is loaded.
 if (ExtensionManagementUtility::isLoaded('filemetadata')) {
-    $configuration = '--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.relations, related_files';
-    ExtensionManagementUtility::addToAllTCAtypes('sys_file_metadata', $configuration);
+	$configuration = '--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.relations, related_files';
+	ExtensionManagementUtility::addToAllTCAtypes('sys_file_metadata', $configuration);
 }
 
 $tca = [
-    'ctrl' => [
-        'default_sortby' => 'ORDER BY uid DESC',
-        'searchFields' => 'uid,extension,name', // sys_file_metadata.title,sys_file_metadata.keywords,
-    ],
-    'columns' => [
-        'fileinfo' => [
-            'config' => [
-                'type' => 'user',
-                'renderType' => 'findUploader',
-            ],
-        ],
-        'related_files' => [
-            'displayCond' => 'FIELD:sys_language_uid:<=:0',
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_metadata.relations',
-            'config' => ExtensionManagementUtility::getFileFieldTCAConfig(
-                'related_files',
-                [],
-                ''
-            ),
-        ],
-    ],
+	'ctrl' => [
+		'default_sortby' => 'ORDER BY uid DESC',
+		'searchFields' => 'uid,extension,name', // sys_file_metadata.title,sys_file_metadata.keywords,
+	],
+	'columns' => [
+		'fileinfo' => [
+			'config' => [
+				'type' => 'user',
+				'renderType' => 'findUploader',
+			],
+		],
+		'related_files' => [
+			'displayCond' => 'FIELD:sys_language_uid:<=:0',
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_metadata.relations',
+			'config' => ExtensionManagementUtility::getFileFieldTCAConfig(
+				'related_files',
+				[],
+				''
+			),
+		],
+	],
 ];
 ArrayUtility::mergeRecursiveWithOverrule($GLOBALS['TCA']['sys_file_metadata'], $tca);

Configuration/TCA/Overrides/sys_file_reference.php

Indentation +4 added lines, -4 removed lines

@@ -3,13 +3,13 @@
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 
 if (!defined('TYPO3')) {
-    die('Access denied.');
+	die('Access denied.');
 }
 
 $tca = [
-    'ctrl' => [
-        'rootLevel' => -1, // Otherwise File Reference will not work between files.
-    ],
+	'ctrl' => [
+		'rootLevel' => -1, // Otherwise File Reference will not work between files.
+	],
 ];
 
 // Disable the File Upload in IRRE since it can not be configured the target storage.