fabarea / media

Classes/View/Plugin/ImageEditorPlugin.php

Indentation +42 added lines, -42 removed lines

@@ -21,51 +21,51 @@
  */
 class ImageEditorPlugin extends AbstractComponentView
 {
-    /**
-     * Renders a hidden link for image editor.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
-        if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
-            // Load Require JS code
-            $this->loadRequireJsCode();
+	/**
+	 * Renders a hidden link for image editor.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
+		if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
+			// Load Require JS code
+			$this->loadRequireJsCode();
 
-            $result = sprintf(
-                '<a href="%s" id="btn-imageEditor-current" class="btn btn-imageEditor" style="display: none"></a>',
-                $this->getImageEditorUri()
-            );
-        };
-        return $result;
-    }
+			$result = sprintf(
+				'<a href="%s" id="btn-imageEditor-current" class="btn btn-imageEditor" style="display: none"></a>',
+				$this->getImageEditorUri()
+			);
+		};
+		return $result;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getImageEditorUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'ImageEditor',
-                'action' => 'show',
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getImageEditorUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'ImageEditor',
+				'action' => 'show',
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
-        $configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
+		$publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
+		$configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
 
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginImageEditor');
-    }
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginImageEditor');
+	}
 }

Classes/View/Plugin/FilePickerPlugin.php

Indentation +23 added lines, -23 removed lines

@@ -19,30 +19,30 @@
  */
 class FilePickerPlugin extends AbstractComponentView
 {
-    /**
-     * Renders a hidden link for file picker.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        if ($this->getModuleLoader()->hasPlugin('filePicker')) {
-            $this->loadRequireJsCode();
-        };
-        return '';
-    }
+	/**
+	 * Renders a hidden link for file picker.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		if ($this->getModuleLoader()->hasPlugin('filePicker')) {
+			$this->loadRequireJsCode();
+		};
+		return '';
+	}
 
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
-        $configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
+		$publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
+		$configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
 
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginFilePicker');
-    }
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginFilePicker');
+	}
 }

Classes/View/Plugin/LinkCreatorPlugin.php

Indentation +42 added lines, -42 removed lines

@@ -21,51 +21,51 @@
  */
 class LinkCreatorPlugin extends AbstractComponentView
 {
-    /**
-     * Renders a hidden link for link creator.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
-        if ($this->getModuleLoader()->hasPlugin('linkCreator')) {
-            // Load Require JS code
-            $this->loadRequireJsCode();
+	/**
+	 * Renders a hidden link for link creator.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
+		if ($this->getModuleLoader()->hasPlugin('linkCreator')) {
+			// Load Require JS code
+			$this->loadRequireJsCode();
 
-            $result = sprintf(
-                '<a href="%s" id="btn-linkCreator-current" class="btn btn-linkCreator" style="display: none"></a>',
-                $this->getLinkCreatorUri()
-            );
-        };
-        return $result;
-    }
+			$result = sprintf(
+				'<a href="%s" id="btn-linkCreator-current" class="btn btn-linkCreator" style="display: none"></a>',
+				$this->getLinkCreatorUri()
+			);
+		};
+		return $result;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getLinkCreatorUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'LinkCreator',
-                'action' => 'show',
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getLinkCreatorUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'LinkCreator',
+				'action' => 'show',
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
-        $configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
+		$publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
+		$configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
 
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginLinkCreator');
-    }
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginLinkCreator');
+	}
 }

Classes/Resource/FileReferenceService.php

Indentation +157 added lines, -157 removed lines

@@ -20,161 +20,161 @@
  */
 class FileReferenceService
 {
-    /**
-     * Return all references found in sys_file_reference.
-     *
-     * @param File|int $file
-     * @return array
-     */
-    public function findFileReferences($file)
-    {
-        $fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
-
-        // Get the file references of the file.
-        return $this->getDataService()->getRecords(
-            'sys_file_reference',
-            [
-                'uid_local' => $fileIdentifier,
-            ]
-        );
-    }
-
-    /**
-     * Return soft image references.
-     *
-     * @param File|int $file
-     * @return array
-     */
-    public function findSoftImageReferences($file)
-    {
-        $fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
-
-        // Get the file references of the file in the RTE.
-        $softReferences = $this->getDataService()->getRecords(
-            'sys_refindex',
-            [
-                'softref_key' => 'rtehtmlarea_images',
-                'ref_table' => 'sys_file',
-                'ref_uid' => $fileIdentifier,
-            ]
-        );
-        return $softReferences;
-    }
-
-    /**
-     * Return link image references.
-     *
-     * @param File|int $file
-     * @return array
-     */
-    public function findSoftLinkReferences($file)
-    {
-        $fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
-
-        // Get the link references of the file.
-        $softReferences = $this->getDataService()->getRecords(
-            'sys_refindex',
-            [
-                'softref_key' => 'typolink_tag',
-                'ref_table' => 'sys_file',
-                'ref_uid' => $fileIdentifier,
-            ]
-        );
-        return $softReferences;
-    }
-
-    /**
-     * Count all references found in sys_file_reference.
-     *
-     * @param File|int $file
-     * @return int
-     */
-    public function countFileReferences($file)
-    {
-        $fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
-
-        return $this->getDataService()
-            ->count(
-                'sys_file_reference',
-                [
-                    'uid_local' => $fileIdentifier
-                ]
-            );
-    }
-
-    /**
-     * Count soft image references.
-     *
-     * @param File|int $file
-     * @return int
-     */
-    public function countSoftImageReferences($file)
-    {
-        $fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
-
-        return $this->getDataService()
-            ->count(
-                'sys_refindex',
-                [
-                    'softref_key' => 'rtehtmlarea_images',
-                    'ref_table' => 'sys_file',
-                    'ref_uid' => $fileIdentifier
-                ]
-            );
-    }
-
-    /**
-     * Count link image references.
-     *
-     * @param File|int $file
-     * @return int
-     */
-    public function countSoftLinkReferences($file)
-    {
-        $fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
-
-        return $this->getDataService()
-            ->count(
-                'sys_refindex',
-                [
-                    'softref_key' => 'typolink_tag',
-                    'ref_table' => 'sys_file',
-                    'ref_uid' => $fileIdentifier
-                ]
-            );
-    }
-
-    /**
-     * Count total reference.
-     *
-     * @param File|int $file
-     * @return int
-     */
-    public function countTotalReferences($file)
-    {
-        $numberOfReferences = $this->countFileReferences($file);
-        $numberOfReferences += $this->countSoftImageReferences($file);
-        $numberOfReferences += $this->countSoftLinkReferences($file);
-
-        return $numberOfReferences;
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * Return all references found in sys_file_reference.
+	 *
+	 * @param File|int $file
+	 * @return array
+	 */
+	public function findFileReferences($file)
+	{
+		$fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
+
+		// Get the file references of the file.
+		return $this->getDataService()->getRecords(
+			'sys_file_reference',
+			[
+				'uid_local' => $fileIdentifier,
+			]
+		);
+	}
+
+	/**
+	 * Return soft image references.
+	 *
+	 * @param File|int $file
+	 * @return array
+	 */
+	public function findSoftImageReferences($file)
+	{
+		$fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
+
+		// Get the file references of the file in the RTE.
+		$softReferences = $this->getDataService()->getRecords(
+			'sys_refindex',
+			[
+				'softref_key' => 'rtehtmlarea_images',
+				'ref_table' => 'sys_file',
+				'ref_uid' => $fileIdentifier,
+			]
+		);
+		return $softReferences;
+	}
+
+	/**
+	 * Return link image references.
+	 *
+	 * @param File|int $file
+	 * @return array
+	 */
+	public function findSoftLinkReferences($file)
+	{
+		$fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
+
+		// Get the link references of the file.
+		$softReferences = $this->getDataService()->getRecords(
+			'sys_refindex',
+			[
+				'softref_key' => 'typolink_tag',
+				'ref_table' => 'sys_file',
+				'ref_uid' => $fileIdentifier,
+			]
+		);
+		return $softReferences;
+	}
+
+	/**
+	 * Count all references found in sys_file_reference.
+	 *
+	 * @param File|int $file
+	 * @return int
+	 */
+	public function countFileReferences($file)
+	{
+		$fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
+
+		return $this->getDataService()
+			->count(
+				'sys_file_reference',
+				[
+					'uid_local' => $fileIdentifier
+				]
+			);
+	}
+
+	/**
+	 * Count soft image references.
+	 *
+	 * @param File|int $file
+	 * @return int
+	 */
+	public function countSoftImageReferences($file)
+	{
+		$fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
+
+		return $this->getDataService()
+			->count(
+				'sys_refindex',
+				[
+					'softref_key' => 'rtehtmlarea_images',
+					'ref_table' => 'sys_file',
+					'ref_uid' => $fileIdentifier
+				]
+			);
+	}
+
+	/**
+	 * Count link image references.
+	 *
+	 * @param File|int $file
+	 * @return int
+	 */
+	public function countSoftLinkReferences($file)
+	{
+		$fileIdentifier = $file instanceof File ? $file->getUid() : (int)$file;
+
+		return $this->getDataService()
+			->count(
+				'sys_refindex',
+				[
+					'softref_key' => 'typolink_tag',
+					'ref_table' => 'sys_file',
+					'ref_uid' => $fileIdentifier
+				]
+			);
+	}
+
+	/**
+	 * Count total reference.
+	 *
+	 * @param File|int $file
+	 * @return int
+	 */
+	public function countTotalReferences($file)
+	{
+		$numberOfReferences = $this->countFileReferences($file);
+		$numberOfReferences += $this->countSoftImageReferences($file);
+		$numberOfReferences += $this->countSoftLinkReferences($file);
+
+		return $numberOfReferences;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 }

Classes/Controller/ProcessedFileController.php

Indentation +34 added lines, -34 removed lines

@@ -20,42 +20,42 @@
  */
 class ProcessedFileController extends ActionController
 {
-    /**
-     * Initializes the controller before invoking an action method.
-     */
-    public function initializeAction()
-    {
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-            /** @var FileConverter $typeConverter */
-            $typeConverter = GeneralUtility::makeInstance(FileConverter::class);
+	/**
+	 * Initializes the controller before invoking an action method.
+	 */
+	public function initializeAction()
+	{
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+			/** @var FileConverter $typeConverter */
+			$typeConverter = GeneralUtility::makeInstance(FileConverter::class);
 
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
 
-    /**
-     * Create a processed file according to some configuration.
-     *
-     * @param File $file
-     * @param array $processingConfiguration
-     * @return string
-     */
-    public function createAction(File $file, array $processingConfiguration = []): ResponseInterface
-    {
-        $processedFile = $file->process(ProcessedFile::CONTEXT_IMAGECROPSCALEMASK, $processingConfiguration);
+	/**
+	 * Create a processed file according to some configuration.
+	 *
+	 * @param File $file
+	 * @param array $processingConfiguration
+	 * @return string
+	 */
+	public function createAction(File $file, array $processingConfiguration = []): ResponseInterface
+	{
+		$processedFile = $file->process(ProcessedFile::CONTEXT_IMAGECROPSCALEMASK, $processingConfiguration);
 
-        $response = array(
-            'success' => true,
-            'original' => $file->getUid(),
-            'title' => $file->getProperty('title') ? $file->getProperty('title') : $file->getName(),
-            'publicUrl' => $processedFile->getPublicUrl(),
-            'width' => $processedFile->getProperty('width'),
-            'height' => $processedFile->getProperty('height'),
-        );
+		$response = array(
+			'success' => true,
+			'original' => $file->getUid(),
+			'title' => $file->getProperty('title') ? $file->getProperty('title') : $file->getName(),
+			'publicUrl' => $processedFile->getPublicUrl(),
+			'width' => $processedFile->getProperty('width'),
+			'height' => $processedFile->getProperty('height'),
+		);
 
-        header("Content-Type: text/json");
-        return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
-    }
+		header("Content-Type: text/json");
+		return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
+	}
 }

Classes/Controller/ImageEditorController.php

Indentation +29 added lines, -29 removed lines

@@ -22,36 +22,36 @@
  */
 class ImageEditorController extends ActionController
 {
-    /**
-     * Initializes the controller before invoking an action method.
-     */
-    public function initializeAction()
-    {
-        /** @var PageRenderer $pageRenderer */
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
+	/**
+	 * Initializes the controller before invoking an action method.
+	 */
+	public function initializeAction()
+	{
+		/** @var PageRenderer $pageRenderer */
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
 
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-            /** @var FileConverter $typeConverter */
-            $typeConverter = GeneralUtility::makeInstance(FileConverter::class);
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+			/** @var FileConverter $typeConverter */
+			$typeConverter = GeneralUtility::makeInstance(FileConverter::class);
 
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
 
-    /**
-     * Handle GUI for inserting an image in the RTE.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function showAction(File $file): ResponseInterface
-    {
-        $this->view->assign('file', $file);
-        $moduleSignature = MediaModule::getSignature();
-        $this->view->assign('moduleUrl', BackendUtility::getModuleUrl($moduleSignature));
-        return $this->htmlResponse();
-    }
+	/**
+	 * Handle GUI for inserting an image in the RTE.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function showAction(File $file): ResponseInterface
+	{
+		$this->view->assign('file', $file);
+		$moduleSignature = MediaModule::getSignature();
+		$this->view->assign('moduleUrl', BackendUtility::getModuleUrl($moduleSignature));
+		return $this->htmlResponse();
+	}
 }

Classes/Controller/LinkCreatorController.php

Indentation +24 added lines, -24 removed lines

@@ -19,30 +19,30 @@
  */
 class LinkCreatorController extends ActionController
 {
-    /**
-     * Initializes the controller before invoking an action method.
-     */
-    public function initializeAction()
-    {
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-            /** @var FileConverter $typeConverter */
-            $typeConverter = GeneralUtility::makeInstance(FileConverter::class);
+	/**
+	 * Initializes the controller before invoking an action method.
+	 */
+	public function initializeAction()
+	{
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+			/** @var FileConverter $typeConverter */
+			$typeConverter = GeneralUtility::makeInstance(FileConverter::class);
 
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
 
-    /**
-     * Handle GUI for creating a link in the RTE.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function showAction(File $file): ResponseInterface
-    {
-        $this->view->assign('file', $file);
-        return $this->htmlResponse();
-    }
+	/**
+	 * Handle GUI for creating a link in the RTE.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function showAction(File $file): ResponseInterface
+	{
+		$this->view->assign('file', $file);
+		return $this->htmlResponse();
+	}
 }

Classes/Controller/AssetController.php

Indentation +309 added lines, -309 removed lines

@@ -47,313 +47,313 @@
  */
 class AssetController extends ActionController
 {
-    /**
-     * @var string
-     */
-    protected $dataType = 'sys_file';
-
-    /**
-     * @throws StorageNotOnlineException
-     * @throws \InvalidArgumentException
-     * @throws NoSuchArgumentException
-     */
-    public function initializeAction()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-            /** @var FileConverter $typeConverter */
-            $typeConverter = GeneralUtility::makeInstance(FileConverter::class);
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * Force download of the file.
-     *
-     * @param File $file
-     * @param bool $forceDownload
-     * @return bool|string
-     * @throws \RuntimeException
-     */
-    public function downloadAction(File $file, $forceDownload = false): ResponseInterface
-    {
-        if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
-            // Emit signal before downloading the file.
-            $this->emitBeforeDownloadSignal($file);
-
-            // Read the file and dump it with the flag "forceDownload" set to true or false.
-            $file->getStorage()->streamFile($file, $forceDownload);
-
-            $result = true;
-        } else {
-            $result = 'Access denied!';
-        }
-
-        return $this->htmlResponse($result);
-    }
-
-    /**
-     * Handle file upload for a new file.
-     *
-     * @param string $combinedIdentifier
-     * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
-     * @return string
-     */
-    public function createAction($combinedIdentifier): ResponseInterface
-    {
-        /** @var UploadedFileInterface $uploadedFile */
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
-        }
-
-        // Get the target folder.
-        if ($this->getMediaModule()->hasFolderTree()) {
-            $targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
-        } else {
-            $storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-            $targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
-        }
-
-        try {
-            $conflictMode = DuplicationBehavior::RENAME;
-            $fileName = $uploadedFile->getName();
-            $file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->extractMetadata($file)
-                ->applyDefaultCategories($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
-    }
-
-    /**
-     * Handle file upload for an existing file.
-     *
-     * @param File $file
-     * @return string
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
-    public function updateAction(File $file): ResponseInterface
-    {
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
-        }
-
-        /** @var $file File */
-        $targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
-
-        try {
-            $storage = $file->getStorage();
-            $storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->updateIndex($file)
-                ->extractMetadata($file);
-
-            // Clear cache on pages holding a reference to this file.
-            $this->getCacheService()->clearCache($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-                'fileInfo' => $this->getMetadataViewHelper()->render($file),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
-    }
-
-    /**
-     * Returns an editing form for moving Files between storage.
-     *
-     * @param array $matches
-     * @throws \Exception
-     */
-    public function editStorageAction(array $matches = []): ResponseInterface
-    {
-        $this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
-        $this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
-
-        $fieldName = 'storage';
-
-        // Instantiate the Matcher object according different rules.
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        $fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
-
-        $this->view->assign('fieldType', ucfirst($fieldType));
-        $this->view->assign('dataType', $this->dataType);
-        $this->view->assign('matches', $matches);
-        $this->view->assign('fieldNameAndPath', $fieldName);
-        $this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
-        $this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
-        return $this->htmlResponse();
-    }
-
-    /**
-     * Handle file upload.
-     *
-     * @return UploadedFileInterface|array
-     * @throws \InvalidArgumentException
-     */
-    protected function handleUpload()
-    {
-        /** @var $uploadManager UploadManager */
-        $uploadManager = GeneralUtility::makeInstance(UploadManager::class);
-
-        try {
-            /** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
-            $result = $uploadManager->handleUpload();
-        } catch (\Exception $e) {
-            $result = array('error' => $e->getMessage());
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return MetadataViewHelper
-     * @throws \InvalidArgumentException
-     */
-    protected function getMetadataViewHelper()
-    {
-        return GeneralUtility::makeInstance(MetadataViewHelper::class);
-    }
-
-    /**
-     * @param File $file
-     * @return ThumbnailService
-     * @throws InvalidKeyInArrayException
-     * @throws \InvalidArgumentException
-     */
-    protected function getThumbnailService(File $file)
-    {
-        /** @var $thumbnailService ThumbnailService */
-        $thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
-        $thumbnailService->setAppendTimeStamp(true)
-            ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
-        return $thumbnailService;
-    }
-
-    /**
-     * Get the instance of the Indexer service to update the metadata of the file.
-     *
-     * @param int|ResourceStorage $storage
-     * @return MediaIndexer
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaIndexer($storage)
-    {
-        return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
-    }
-
-    /**
-     * @return CacheService
-     * @throws \InvalidArgumentException
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(CacheService::class);
-    }
-
-    /**
-     * Signal that is emitted before a file is downloaded.
-     *
-     * @param File $file
-     * @return void
-     * @throws InvalidSlotReturnException
-     * @throws InvalidSlotException
-     */
-    protected function emitBeforeDownloadSignal(File $file)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher.
-     *
-     * @return Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
-
-    /**
-     * @return ContentService
-     * @throws \InvalidArgumentException
-     */
-    protected function getContentService()
-    {
-        return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
-    }
-
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * @var string
+	 */
+	protected $dataType = 'sys_file';
+
+	/**
+	 * @throws StorageNotOnlineException
+	 * @throws \InvalidArgumentException
+	 * @throws NoSuchArgumentException
+	 */
+	public function initializeAction()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+			/** @var FileConverter $typeConverter */
+			$typeConverter = GeneralUtility::makeInstance(FileConverter::class);
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * Force download of the file.
+	 *
+	 * @param File $file
+	 * @param bool $forceDownload
+	 * @return bool|string
+	 * @throws \RuntimeException
+	 */
+	public function downloadAction(File $file, $forceDownload = false): ResponseInterface
+	{
+		if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
+			// Emit signal before downloading the file.
+			$this->emitBeforeDownloadSignal($file);
+
+			// Read the file and dump it with the flag "forceDownload" set to true or false.
+			$file->getStorage()->streamFile($file, $forceDownload);
+
+			$result = true;
+		} else {
+			$result = 'Access denied!';
+		}
+
+		return $this->htmlResponse($result);
+	}
+
+	/**
+	 * Handle file upload for a new file.
+	 *
+	 * @param string $combinedIdentifier
+	 * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
+	 * @return string
+	 */
+	public function createAction($combinedIdentifier): ResponseInterface
+	{
+		/** @var UploadedFileInterface $uploadedFile */
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
+		}
+
+		// Get the target folder.
+		if ($this->getMediaModule()->hasFolderTree()) {
+			$targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
+		} else {
+			$storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+			$targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
+		}
+
+		try {
+			$conflictMode = DuplicationBehavior::RENAME;
+			$fileName = $uploadedFile->getName();
+			$file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->extractMetadata($file)
+				->applyDefaultCategories($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
+	}
+
+	/**
+	 * Handle file upload for an existing file.
+	 *
+	 * @param File $file
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 * @throws \RuntimeException
+	 */
+	public function updateAction(File $file): ResponseInterface
+	{
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
+		}
+
+		/** @var $file File */
+		$targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
+
+		try {
+			$storage = $file->getStorage();
+			$storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->updateIndex($file)
+				->extractMetadata($file);
+
+			// Clear cache on pages holding a reference to this file.
+			$this->getCacheService()->clearCache($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+				'fileInfo' => $this->getMetadataViewHelper()->render($file),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
+	}
+
+	/**
+	 * Returns an editing form for moving Files between storage.
+	 *
+	 * @param array $matches
+	 * @throws \Exception
+	 */
+	public function editStorageAction(array $matches = []): ResponseInterface
+	{
+		$this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
+		$this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
+
+		$fieldName = 'storage';
+
+		// Instantiate the Matcher object according different rules.
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		$fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
+
+		$this->view->assign('fieldType', ucfirst($fieldType));
+		$this->view->assign('dataType', $this->dataType);
+		$this->view->assign('matches', $matches);
+		$this->view->assign('fieldNameAndPath', $fieldName);
+		$this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
+		$this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
+		return $this->htmlResponse();
+	}
+
+	/**
+	 * Handle file upload.
+	 *
+	 * @return UploadedFileInterface|array
+	 * @throws \InvalidArgumentException
+	 */
+	protected function handleUpload()
+	{
+		/** @var $uploadManager UploadManager */
+		$uploadManager = GeneralUtility::makeInstance(UploadManager::class);
+
+		try {
+			/** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
+			$result = $uploadManager->handleUpload();
+		} catch (\Exception $e) {
+			$result = array('error' => $e->getMessage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return MetadataViewHelper
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMetadataViewHelper()
+	{
+		return GeneralUtility::makeInstance(MetadataViewHelper::class);
+	}
+
+	/**
+	 * @param File $file
+	 * @return ThumbnailService
+	 * @throws InvalidKeyInArrayException
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getThumbnailService(File $file)
+	{
+		/** @var $thumbnailService ThumbnailService */
+		$thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
+		$thumbnailService->setAppendTimeStamp(true)
+			->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
+		return $thumbnailService;
+	}
+
+	/**
+	 * Get the instance of the Indexer service to update the metadata of the file.
+	 *
+	 * @param int|ResourceStorage $storage
+	 * @return MediaIndexer
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaIndexer($storage)
+	{
+		return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
+	}
+
+	/**
+	 * @return CacheService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(CacheService::class);
+	}
+
+	/**
+	 * Signal that is emitted before a file is downloaded.
+	 *
+	 * @param File $file
+	 * @return void
+	 * @throws InvalidSlotReturnException
+	 * @throws InvalidSlotException
+	 */
+	protected function emitBeforeDownloadSignal(File $file)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher.
+	 *
+	 * @return Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
+
+	/**
+	 * @return ContentService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getContentService()
+	{
+		return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Module/MediaModule.php

Indentation +323 added lines, -323 removed lines

@@ -27,327 +27,327 @@
  */
 class MediaModule implements SingletonInterface
 {
-    /**
-     * @var string
-     */
-    public const SIGNATURE = 'user_MediaM1';
-
-    /**
-     * @var string
-     */
-    public const PARAMETER_PREFIX = 'tx_media_user_mediam1';
-
-    /**
-     * @var ResourceStorage
-     */
-    protected $currentStorage;
-
-    /**
-     * @return string
-     */
-    public static function getSignature()
-    {
-        return self::SIGNATURE;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getParameterPrefix()
-    {
-        return self::PARAMETER_PREFIX;
-    }
-
-    /**
-     * Return all storage allowed for the Backend User.
-     *
-     * @throws \RuntimeException
-     * @return ResourceStorage[]
-     */
-    public function getAllowedStorages()
-    {
-        $storages = $this->getBackendUser()->getFileStorages();
-        if (empty($storages)) {
-            throw new \RuntimeException('No storage is accessible for the current BE User. Forgotten to define a mount point for this BE User?', 1380801970);
-        }
-        return $storages;
-    }
-
-    /**
-     * Returns the current file storage in use.
-     *
-     * @return ResourceStorage
-     */
-    public function getCurrentStorage()
-    {
-        if (is_null($this->currentStorage)) {
-            $storageIdentifier = $this->getStorageIdentifierFromSessionOrArguments();
-
-            if ($storageIdentifier > 0) {
-                $currentStorage = $this->getResourceFactory()->getStorageObject($storageIdentifier);
-            } else {
-                // We differentiate the cases whether the User is admin or not.
-                if ($this->getBackendUser()->isAdmin()) {
-                    $currentStorage = $this->getResourceFactory()->getDefaultStorage();
-
-                    // Not default storage has been flagged in "sys_file_storage".
-                    // Fallback approach: take the first storage as the current.
-                    if (!$currentStorage) {
-                        /** @var $storageRepository StorageRepository */
-                        $storageRepository = GeneralUtility::makeInstance(StorageRepository::class);
-
-                        $storages = $storageRepository->findAll();
-                        $currentStorage = current($storages);
-                    }
-                } else {
-                    $fileMounts = $this->getBackendUser()->getFileMountRecords();
-                    $firstFileMount = current($fileMounts);
-                    $currentStorage = $this->getResourceFactory()->getStorageObject($firstFileMount['base']);
-                }
-            }
-
-            $this->currentStorage = $currentStorage;
-        }
-        return $this->currentStorage;
-    }
-
-    /**
-     * Retrieve a possible storage identifier from the session or from the arguments.
-     *
-     * @return int
-     */
-    protected function getStorageIdentifierFromSessionOrArguments()
-    {
-        // Default value
-        $storageIdentifier = 0;
-
-        // Get last selected storage from User settings
-        if (SessionUtility::getInstance()->get('lastSelectedStorage') > 0) {
-            $storageIdentifier = SessionUtility::getInstance()->get('lastSelectedStorage');
-        }
-
-        $argumentPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $arguments = GeneralUtility::_GET($argumentPrefix);
-
-        // Override selected storage from the session if GET argument "storage" is detected.
-        if (!empty($arguments['storage']) && (int)$arguments['storage'] > 0) {
-            $storageIdentifier = (int)$arguments['storage'];
-
-            // Save state
-            SessionUtility::getInstance()->set('lastSelectedStorage', $storageIdentifier);
-        }
-
-        return (int)$storageIdentifier;
-    }
-
-    /**
-     * Return the combined parameter from the URL.
-     *
-     * @return string
-     */
-    public function getCombinedIdentifier()
-    {
-        // Fetch possible combined identifier.
-        $combinedIdentifier = GeneralUtility::_GET('id');
-
-        if ($combinedIdentifier) {
-            // Fix a bug at the Core level: the "id" parameter is encoded again when translating file.
-            // Add a loop to decode maximum 999 time!
-            $semaphore = 0;
-            $semaphoreLimit = 999;
-            while (!$this->isWellDecoded($combinedIdentifier) && $semaphore < $semaphoreLimit) {
-                $combinedIdentifier = urldecode($combinedIdentifier);
-                $semaphore++;
-            }
-        }
-
-        return $combinedIdentifier;
-    }
-
-    /**
-     * @param $combinedIdentifier
-     * @return bool
-     */
-    protected function isWellDecoded($combinedIdentifier)
-    {
-        return preg_match('/.*:.*/', $combinedIdentifier);
-    }
-
-    /**
-     * @return Folder
-     */
-    public function getFirstAvailableFolder()
-    {
-        // Take the first object of the first storage.
-        $storages = $this->getBackendUser()->getFileStorages();
-        $storage = reset($storages);
-        if ($storage) {
-            $folder = $storage->getRootLevelFolder();
-        } else {
-            throw new \RuntimeException('Could not find any folder to be displayed.', 1444665954);
-        }
-        return $folder;
-    }
-
-    /**
-     * @return Folder
-     */
-    public function getCurrentFolder()
-    {
-        $combinedIdentifier = $this->getCombinedIdentifier();
-
-        if ($combinedIdentifier) {
-            $folder = $this->getFolderForCombinedIdentifier($combinedIdentifier);
-        } else {
-            $folder = $this->getFirstAvailableFolder();
-        }
-
-        return $folder;
-    }
-
-    /**
-     * @param string $combinedIdentifier
-     * @return Folder
-     */
-    public function getFolderForCombinedIdentifier($combinedIdentifier)
-    {
-        // Code taken from FileListController.php
-        $storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-        $identifier = substr($combinedIdentifier, strpos($combinedIdentifier, ':') + 1);
-        if (!$storage->hasFolder($identifier)) {
-            $identifier = $storage->getFolderIdentifierFromFileIdentifier($identifier);
-        }
-
-        // Retrieve the folder object.
-        $folder = $this->getResourceFactory()->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
-
-        // Disallow the rendering of the processing folder (e.g. could be called manually)
-        // and all folders without any defined storage
-        if ($folder && ($folder->getStorage()->getUid() == 0 || trim($folder->getStorage()->getProcessingFolder()->getIdentifier(), '/') === trim($folder->getIdentifier(), '/'))) {
-            $storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-            $folder = $storage->getRootLevelFolder();
-        }
-
-        return $folder;
-    }
-
-    /**
-     * Tell whether the Folder Tree is display or not.
-     *
-     * @return bool
-     */
-    public function hasFolderTree()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return (bool)$configuration['has_folder_tree'];
-    }
-
-    /**
-     * Tell whether the sub-folders must be included when browsing.
-     *
-     * @return bool
-     */
-    public function hasRecursiveSelection()
-    {
-        $parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $parameters = GeneralUtility::_GET($parameterPrefix);
-
-        $hasRecursiveSelection = true;
-        if (isset($parameters['hasRecursiveSelection'])) {
-            $hasRecursiveSelection = (bool)$parameters['hasRecursiveSelection'];
-        }
-
-        return $hasRecursiveSelection;
-    }
-
-    /**
-     * Return the target folder for the uploaded file.
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @param ResourceStorage $storage
-     * @return Folder
-     */
-    public function getTargetFolderForUploadedFile(UploadedFileInterface $uploadedFile, ResourceStorage $storage)
-    {
-        // default is the root level
-        $folder = $storage->getRootLevelFolder(); // get the root folder by default
-
-        // Get a possible mount point coming from the storage record.
-        $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $uploadedFile->getType()];
-        if ($mountPointIdentifier > 0) {
-            // We don't have a Mount Point repository in FAL, so query the database directly.
-            $record = $this->getDataService()->getRecord('sys_filemounts', ['uid' => $mountPointIdentifier]);
-
-            if (!empty($record['path'])) {
-                $folder = $storage->getFolder($record['path']);
-            }
-        }
-        return $folder;
-    }
-
-    /**
-     * Return a new target folder when moving file from one storage to another.
-     *
-     * @param ResourceStorage $storage
-     * @param File $file
-     * @return Folder
-     */
-    public function getDefaultFolderInStorage(ResourceStorage $storage, File $file)
-    {
-        // default is the root level
-        $folder = $storage->getRootLevelFolder();
-
-        // Retrieve storage record and a possible configured mount point.
-        $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $file->getType()];
-
-        if ($mountPointIdentifier > 0) {
-            // We don't have a Mount Point repository in FAL, so query the database directly.
-            $record = $this->getDataService()->getRecord('sys_filemounts', ['uid' => $mountPointIdentifier]);
-            if (!empty($record['path'])) {
-                $folder = $storage->getFolder($record['path']);
-            }
-        }
-        return $folder;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getModuleConfiguration()
-    {
-        return GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * @return ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * @var string
+	 */
+	public const SIGNATURE = 'user_MediaM1';
+
+	/**
+	 * @var string
+	 */
+	public const PARAMETER_PREFIX = 'tx_media_user_mediam1';
+
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $currentStorage;
+
+	/**
+	 * @return string
+	 */
+	public static function getSignature()
+	{
+		return self::SIGNATURE;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getParameterPrefix()
+	{
+		return self::PARAMETER_PREFIX;
+	}
+
+	/**
+	 * Return all storage allowed for the Backend User.
+	 *
+	 * @throws \RuntimeException
+	 * @return ResourceStorage[]
+	 */
+	public function getAllowedStorages()
+	{
+		$storages = $this->getBackendUser()->getFileStorages();
+		if (empty($storages)) {
+			throw new \RuntimeException('No storage is accessible for the current BE User. Forgotten to define a mount point for this BE User?', 1380801970);
+		}
+		return $storages;
+	}
+
+	/**
+	 * Returns the current file storage in use.
+	 *
+	 * @return ResourceStorage
+	 */
+	public function getCurrentStorage()
+	{
+		if (is_null($this->currentStorage)) {
+			$storageIdentifier = $this->getStorageIdentifierFromSessionOrArguments();
+
+			if ($storageIdentifier > 0) {
+				$currentStorage = $this->getResourceFactory()->getStorageObject($storageIdentifier);
+			} else {
+				// We differentiate the cases whether the User is admin or not.
+				if ($this->getBackendUser()->isAdmin()) {
+					$currentStorage = $this->getResourceFactory()->getDefaultStorage();
+
+					// Not default storage has been flagged in "sys_file_storage".
+					// Fallback approach: take the first storage as the current.
+					if (!$currentStorage) {
+						/** @var $storageRepository StorageRepository */
+						$storageRepository = GeneralUtility::makeInstance(StorageRepository::class);
+
+						$storages = $storageRepository->findAll();
+						$currentStorage = current($storages);
+					}
+				} else {
+					$fileMounts = $this->getBackendUser()->getFileMountRecords();
+					$firstFileMount = current($fileMounts);
+					$currentStorage = $this->getResourceFactory()->getStorageObject($firstFileMount['base']);
+				}
+			}
+
+			$this->currentStorage = $currentStorage;
+		}
+		return $this->currentStorage;
+	}
+
+	/**
+	 * Retrieve a possible storage identifier from the session or from the arguments.
+	 *
+	 * @return int
+	 */
+	protected function getStorageIdentifierFromSessionOrArguments()
+	{
+		// Default value
+		$storageIdentifier = 0;
+
+		// Get last selected storage from User settings
+		if (SessionUtility::getInstance()->get('lastSelectedStorage') > 0) {
+			$storageIdentifier = SessionUtility::getInstance()->get('lastSelectedStorage');
+		}
+
+		$argumentPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$arguments = GeneralUtility::_GET($argumentPrefix);
+
+		// Override selected storage from the session if GET argument "storage" is detected.
+		if (!empty($arguments['storage']) && (int)$arguments['storage'] > 0) {
+			$storageIdentifier = (int)$arguments['storage'];
+
+			// Save state
+			SessionUtility::getInstance()->set('lastSelectedStorage', $storageIdentifier);
+		}
+
+		return (int)$storageIdentifier;
+	}
+
+	/**
+	 * Return the combined parameter from the URL.
+	 *
+	 * @return string
+	 */
+	public function getCombinedIdentifier()
+	{
+		// Fetch possible combined identifier.
+		$combinedIdentifier = GeneralUtility::_GET('id');
+
+		if ($combinedIdentifier) {
+			// Fix a bug at the Core level: the "id" parameter is encoded again when translating file.
+			// Add a loop to decode maximum 999 time!
+			$semaphore = 0;
+			$semaphoreLimit = 999;
+			while (!$this->isWellDecoded($combinedIdentifier) && $semaphore < $semaphoreLimit) {
+				$combinedIdentifier = urldecode($combinedIdentifier);
+				$semaphore++;
+			}
+		}
+
+		return $combinedIdentifier;
+	}
+
+	/**
+	 * @param $combinedIdentifier
+	 * @return bool
+	 */
+	protected function isWellDecoded($combinedIdentifier)
+	{
+		return preg_match('/.*:.*/', $combinedIdentifier);
+	}
+
+	/**
+	 * @return Folder
+	 */
+	public function getFirstAvailableFolder()
+	{
+		// Take the first object of the first storage.
+		$storages = $this->getBackendUser()->getFileStorages();
+		$storage = reset($storages);
+		if ($storage) {
+			$folder = $storage->getRootLevelFolder();
+		} else {
+			throw new \RuntimeException('Could not find any folder to be displayed.', 1444665954);
+		}
+		return $folder;
+	}
+
+	/**
+	 * @return Folder
+	 */
+	public function getCurrentFolder()
+	{
+		$combinedIdentifier = $this->getCombinedIdentifier();
+
+		if ($combinedIdentifier) {
+			$folder = $this->getFolderForCombinedIdentifier($combinedIdentifier);
+		} else {
+			$folder = $this->getFirstAvailableFolder();
+		}
+
+		return $folder;
+	}
+
+	/**
+	 * @param string $combinedIdentifier
+	 * @return Folder
+	 */
+	public function getFolderForCombinedIdentifier($combinedIdentifier)
+	{
+		// Code taken from FileListController.php
+		$storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+		$identifier = substr($combinedIdentifier, strpos($combinedIdentifier, ':') + 1);
+		if (!$storage->hasFolder($identifier)) {
+			$identifier = $storage->getFolderIdentifierFromFileIdentifier($identifier);
+		}
+
+		// Retrieve the folder object.
+		$folder = $this->getResourceFactory()->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
+
+		// Disallow the rendering of the processing folder (e.g. could be called manually)
+		// and all folders without any defined storage
+		if ($folder && ($folder->getStorage()->getUid() == 0 || trim($folder->getStorage()->getProcessingFolder()->getIdentifier(), '/') === trim($folder->getIdentifier(), '/'))) {
+			$storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+			$folder = $storage->getRootLevelFolder();
+		}
+
+		return $folder;
+	}
+
+	/**
+	 * Tell whether the Folder Tree is display or not.
+	 *
+	 * @return bool
+	 */
+	public function hasFolderTree()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return (bool)$configuration['has_folder_tree'];
+	}
+
+	/**
+	 * Tell whether the sub-folders must be included when browsing.
+	 *
+	 * @return bool
+	 */
+	public function hasRecursiveSelection()
+	{
+		$parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$parameters = GeneralUtility::_GET($parameterPrefix);
+
+		$hasRecursiveSelection = true;
+		if (isset($parameters['hasRecursiveSelection'])) {
+			$hasRecursiveSelection = (bool)$parameters['hasRecursiveSelection'];
+		}
+
+		return $hasRecursiveSelection;
+	}
+
+	/**
+	 * Return the target folder for the uploaded file.
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @param ResourceStorage $storage
+	 * @return Folder
+	 */
+	public function getTargetFolderForUploadedFile(UploadedFileInterface $uploadedFile, ResourceStorage $storage)
+	{
+		// default is the root level
+		$folder = $storage->getRootLevelFolder(); // get the root folder by default
+
+		// Get a possible mount point coming from the storage record.
+		$storageRecord = $storage->getStorageRecord();
+		$mountPointIdentifier = $storageRecord['mount_point_file_type_' . $uploadedFile->getType()];
+		if ($mountPointIdentifier > 0) {
+			// We don't have a Mount Point repository in FAL, so query the database directly.
+			$record = $this->getDataService()->getRecord('sys_filemounts', ['uid' => $mountPointIdentifier]);
+
+			if (!empty($record['path'])) {
+				$folder = $storage->getFolder($record['path']);
+			}
+		}
+		return $folder;
+	}
+
+	/**
+	 * Return a new target folder when moving file from one storage to another.
+	 *
+	 * @param ResourceStorage $storage
+	 * @param File $file
+	 * @return Folder
+	 */
+	public function getDefaultFolderInStorage(ResourceStorage $storage, File $file)
+	{
+		// default is the root level
+		$folder = $storage->getRootLevelFolder();
+
+		// Retrieve storage record and a possible configured mount point.
+		$storageRecord = $storage->getStorageRecord();
+		$mountPointIdentifier = $storageRecord['mount_point_file_type_' . $file->getType()];
+
+		if ($mountPointIdentifier > 0) {
+			// We don't have a Mount Point repository in FAL, so query the database directly.
+			$record = $this->getDataService()->getRecord('sys_filemounts', ['uid' => $mountPointIdentifier]);
+			if (!empty($record['path'])) {
+				$folder = $storage->getFolder($record['path']);
+			}
+		}
+		return $folder;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getModuleConfiguration()
+	{
+		return GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * @return ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -219,7 +219,7 @@ 
         }
 
         // Retrieve the folder object.
-        $folder = $this->getResourceFactory()->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
+        $folder = $this->getResourceFactory()->getFolderObjectFromCombinedIdentifier($storage->getUid().':'.$identifier);
 
         // Disallow the rendering of the processing folder (e.g. could be called manually)
         // and all folders without any defined storage
@@ -274,7 +274,7 @@ 
 
         // Get a possible mount point coming from the storage record.
         $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $uploadedFile->getType()];
+        $mountPointIdentifier = $storageRecord['mount_point_file_type_'.$uploadedFile->getType()];
         if ($mountPointIdentifier > 0) {
             // We don't have a Mount Point repository in FAL, so query the database directly.
             $record = $this->getDataService()->getRecord('sys_filemounts', ['uid' => $mountPointIdentifier]);
@@ -300,7 +300,7 @@ 
 
         // Retrieve storage record and a possible configured mount point.
         $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $file->getType()];
+        $mountPointIdentifier = $storageRecord['mount_point_file_type_'.$file->getType()];
 
         if ($mountPointIdentifier > 0) {
             // We don't have a Mount Point repository in FAL, so query the database directly.