fabarea / media

Classes/ViewHelpers/Uri/MoveViewHelper.php

Indentation +26 added lines, -26 removed lines

@@ -18,33 +18,33 @@
  */
 class MoveViewHelper extends AbstractViewHelper
 {
-    /**
-     * Render a move storage URI.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $urlParameters = array(
-            VidiModule::getParameterPrefix() => array(
-                'controller' => 'Content',
-                'action' => 'move',
-                'fieldNameAndPath' => $this->templateVariableContainer->get('fieldNameAndPath'),
-                'matches' => $this->templateVariableContainer->get('matches'),
-            ),
-        );
+	/**
+	 * Render a move storage URI.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$urlParameters = array(
+			VidiModule::getParameterPrefix() => array(
+				'controller' => 'Content',
+				'action' => 'move',
+				'fieldNameAndPath' => $this->templateVariableContainer->get('fieldNameAndPath'),
+				'matches' => $this->templateVariableContainer->get('matches'),
+			),
+		);
 
-        $moduleUrl = BackendUtility::getModuleUrl(
-            VidiModule::getSignature(),
-            $urlParameters
-        );
+		$moduleUrl = BackendUtility::getModuleUrl(
+			VidiModule::getSignature(),
+			$urlParameters
+		);
 
-        // Work around a bug in BackendUtility::getModuleUrl if matches is empty getModuleUrl() will not return the parameter.
-        $matches = $this->templateVariableContainer->get('matches');
-        if (empty($matches)) {
-            $moduleUrl .= '&' . urlencode(VidiModule::getParameterPrefix() . '[matches]=');
-        }
+		// Work around a bug in BackendUtility::getModuleUrl if matches is empty getModuleUrl() will not return the parameter.
+		$matches = $this->templateVariableContainer->get('matches');
+		if (empty($matches)) {
+			$moduleUrl .= '&' . urlencode(VidiModule::getParameterPrefix() . '[matches]=');
+		}
 
-        return $moduleUrl;
-    }
+		return $moduleUrl;
+	}
 }

Classes/Override/Backend/Form/FormResultCompiler.php

Indentation +26 added lines, -26 removed lines

@@ -18,37 +18,37 @@
  */
 class FormResultCompiler extends \TYPO3\CMS\Backend\Form\FormResultCompiler
 {
-    /**
-     * JavaScript bottom code
-     *
-     * @param string $formname The identification of the form on the page.
-     * @return string A section with JavaScript - if $update is false, embedded in <script></script>
-     */
-    protected function JSbottom()
-    {
-        $out = parent::JSbottom();
+	/**
+	 * JavaScript bottom code
+	 *
+	 * @param string $formname The identification of the form on the page.
+	 * @return string A section with JavaScript - if $update is false, embedded in <script></script>
+	 */
+	protected function JSbottom()
+	{
+		$out = parent::JSbottom();
 
-        $tsConfig = $this->getBackendUser()->getTSConfig();
-        $enableMediaFilePicker = (bool)$tsConfig['options.vidi.enableMediaFilePicker'];
-        if ($enableMediaFilePicker) {
-            $pageRenderer = $this->getPageRenderer();
-            $pageRenderer->loadRequireJsModule('TYPO3/CMS/Media/MediaFormEngine', 'function(MediaFormEngine) {
+		$tsConfig = $this->getBackendUser()->getTSConfig();
+		$enableMediaFilePicker = (bool)$tsConfig['options.vidi.enableMediaFilePicker'];
+		if ($enableMediaFilePicker) {
+			$pageRenderer = $this->getPageRenderer();
+			$pageRenderer->loadRequireJsModule('TYPO3/CMS/Media/MediaFormEngine', 'function(MediaFormEngine) {
             MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()) . '\';
             MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix() . '\';
             MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')) . ';
         }');
-        }
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -33,9 +33,9 @@
         if ($enableMediaFilePicker) {
             $pageRenderer = $this->getPageRenderer();
             $pageRenderer->loadRequireJsModule('TYPO3/CMS/Media/MediaFormEngine', 'function(MediaFormEngine) {
-            MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()) . '\';
-            MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix() . '\';
-            MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')) . ';
+            MediaFormEngine.vidiModuleUrl = \'' . BackendUtility::getModuleUrl(VidiModule::getSignature()).'\';
+            MediaFormEngine.vidiModulePrefix = \'' . VidiModule::getParameterPrefix().'\';
+            MediaFormEngine.browserUrl = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('wizard_element_browser')).';
         }');
         }
 

Classes/Backend/TceForms.php

Indentation +32 added lines, -32 removed lines

@@ -20,36 +20,36 @@
  */
 class TceForms extends AbstractFormElement
 {
-    /**
-     * @return array
-     */
-    public function render()
-    {
-        // Load StyleSheets in the Page Renderer
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $cssFile = ExtensionManagementUtility::extPath('media') . 'Resources/Public/StyleSheets/fineuploader.tce.css';
-        $pageRenderer->addCssFile($cssFile);
-
-        // language labels for JavaScript files
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
-
-        // js files to be loaded
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core') . 'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/JavaScript/Encoder.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
-
-        $result = $this->initializeResultArray();
-
-        $fileMetadataRecord = $this->data['databaseRow'];
-
-        if ($fileMetadataRecord['file'] <= 0) {
-            throw new \Exception('I could not find a valid file identifier', 1392926871);
-        }
-
-        /** @var $fileUpload \Fab\Media\Form\FileUploadTceForms */
-        $fileUpload = GeneralUtility::makeInstance(FileUploadTceForms::class);
-        $fileUpload->setValue($fileMetadataRecord['file'][0])->setPrefix(MediaModule::getParameterPrefix());
-        $result['html'] = $fileUpload->render();
-        return $result;
-    }
+	/**
+	 * @return array
+	 */
+	public function render()
+	{
+		// Load StyleSheets in the Page Renderer
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$cssFile = ExtensionManagementUtility::extPath('media') . 'Resources/Public/StyleSheets/fineuploader.tce.css';
+		$pageRenderer->addCssFile($cssFile);
+
+		// language labels for JavaScript files
+		$pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+
+		// js files to be loaded
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core') . 'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/JavaScript/Encoder.js');
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
+
+		$result = $this->initializeResultArray();
+
+		$fileMetadataRecord = $this->data['databaseRow'];
+
+		if ($fileMetadataRecord['file'] <= 0) {
+			throw new \Exception('I could not find a valid file identifier', 1392926871);
+		}
+
+		/** @var $fileUpload \Fab\Media\Form\FileUploadTceForms */
+		$fileUpload = GeneralUtility::makeInstance(FileUploadTceForms::class);
+		$fileUpload->setValue($fileMetadataRecord['file'][0])->setPrefix(MediaModule::getParameterPrefix());
+		$result['html'] = $fileUpload->render();
+		return $result;
+	}
 }

Classes/Command/FileCacheWarmUpCommand.php

Indentation +23 added lines, -23 removed lines

@@ -18,27 +18,27 @@
 
 class FileCacheWarmUpCommand extends Command
 {
-    protected SymfonyStyle $io;
-
-    protected function initialize(InputInterface $input, OutputInterface $output)
-    {
-        $this->io = new SymfonyStyle($input, $output);
-    }
-
-    /**
-     * Warm up the cache. Update some caching columns such as "number_of_references" to speed up the search.
-     */
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $numberOfEntries = $this->getCacheService()->warmUp();
-        $message = sprintf('Done! Processed %s entries', $numberOfEntries);
-        $this->io->info($message);
-
-        return 0;
-    }
-
-    protected function getCacheService(): CacheService
-    {
-        return GeneralUtility::makeInstance(CacheService::class);
-    }
+	protected SymfonyStyle $io;
+
+	protected function initialize(InputInterface $input, OutputInterface $output)
+	{
+		$this->io = new SymfonyStyle($input, $output);
+	}
+
+	/**
+	 * Warm up the cache. Update some caching columns such as "number_of_references" to speed up the search.
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output): int
+	{
+		$numberOfEntries = $this->getCacheService()->warmUp();
+		$message = sprintf('Done! Processed %s entries', $numberOfEntries);
+		$this->io->info($message);
+
+		return 0;
+	}
+
+	protected function getCacheService(): CacheService
+	{
+		return GeneralUtility::makeInstance(CacheService::class);
+	}
 }

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

Indentation +198 added lines, -198 removed lines

@@ -27,202 +27,202 @@
  */
 class FilePermissionsAspect
 {
-    /**
-     * Post-process the matcher object to respect the file storages.
-     *
-     * @param Matcher $matcher
-     * @param string $dataType
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    public function addFilePermissionsForFileStorages(Matcher $matcher, $dataType)
-    {
-        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);
-            }
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isPermissionNecessary()
-    {
-        $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;
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isFolderConsidered()
-    {
-        return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
-    }
-
-    /**
-     * @param Folder $folder
-     * @return array
-     */
-    protected function getFileUids(Folder $folder)
-    {
-        $files = [];
-        foreach ($folder->getFiles() as $file) {
-            $files[] = $file->getUid();
-        }
-        return $files;
-    }
-
-    /**
-     * Post-process the constraints object to respect the file mounts.
-     *
-     * @param Query $query
-     * @param ConstraintInterface|null $constraints
-     * @param ConstraintContainer $constraintContainer
-     * @throws \InvalidArgumentException
-     * @throws InvalidNumberOfConstraintsException
-     */
-    public function addFilePermissionsForFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer)
-    {
-        if ($query->getType() === 'sys_file') {
-            if (!$this->getCurrentBackendUser()->isAdmin()) {
-                $this->respectFileMounts($query, $constraints, $constraintContainer);
-            }
-        }
-    }
-
-    /**
-     * @param Query $query
-     * @param ConstraintInterface|null $constraints
-     * @param ConstraintContainer $constraintContainer
-     * @return array
-     * @throws \InvalidArgumentException
-     * @throws InvalidNumberOfConstraintsException
-     */
-    protected function respectFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer)
-    {
-        $tableName = 'sys_filemounts';
-
-        // Get the file mount identifiers for the current Backend User.
-        $fileMounts = GeneralUtility::trimExplode(',', $this->getCurrentBackendUser()->dataLists['filemount_list']);
-        $fileMountUids = implode(',', array_filter($fileMounts));
-
-        // Fetch the records.
-        $fileMountRecords = $this->getDataService()->getRecords(
-            $tableName,
-            [
-                'uid' => $fileMountUids
-            ]
-        );
-        $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];
-    }
-
-    /**
-     * @return BackendUserAuthentication
-     */
-    protected function getCurrentBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return object|ModuleLoader
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * Post-process the matcher object to respect the file storages.
+	 *
+	 * @param Matcher $matcher
+	 * @param string $dataType
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 */
+	public function addFilePermissionsForFileStorages(Matcher $matcher, $dataType)
+	{
+		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);
+			}
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isPermissionNecessary()
+	{
+		$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;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isFolderConsidered()
+	{
+		return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
+	}
+
+	/**
+	 * @param Folder $folder
+	 * @return array
+	 */
+	protected function getFileUids(Folder $folder)
+	{
+		$files = [];
+		foreach ($folder->getFiles() as $file) {
+			$files[] = $file->getUid();
+		}
+		return $files;
+	}
+
+	/**
+	 * Post-process the constraints object to respect the file mounts.
+	 *
+	 * @param Query $query
+	 * @param ConstraintInterface|null $constraints
+	 * @param ConstraintContainer $constraintContainer
+	 * @throws \InvalidArgumentException
+	 * @throws InvalidNumberOfConstraintsException
+	 */
+	public function addFilePermissionsForFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer)
+	{
+		if ($query->getType() === 'sys_file') {
+			if (!$this->getCurrentBackendUser()->isAdmin()) {
+				$this->respectFileMounts($query, $constraints, $constraintContainer);
+			}
+		}
+	}
+
+	/**
+	 * @param Query $query
+	 * @param ConstraintInterface|null $constraints
+	 * @param ConstraintContainer $constraintContainer
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 * @throws InvalidNumberOfConstraintsException
+	 */
+	protected function respectFileMounts(Query $query, $constraints, ConstraintContainer $constraintContainer)
+	{
+		$tableName = 'sys_filemounts';
+
+		// Get the file mount identifiers for the current Backend User.
+		$fileMounts = GeneralUtility::trimExplode(',', $this->getCurrentBackendUser()->dataLists['filemount_list']);
+		$fileMountUids = implode(',', array_filter($fileMounts));
+
+		// Fetch the records.
+		$fileMountRecords = $this->getDataService()->getRecords(
+			$tableName,
+			[
+				'uid' => $fileMountUids
+			]
+		);
+		$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];
+	}
+
+	/**
+	 * @return BackendUserAuthentication
+	 */
+	protected function getCurrentBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return object|ModuleLoader
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

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'].'%'
                 );
             }
         }