fabarea / media

Classes/View/MenuItem/FilePickerMenuItem.php

Indentation +33 added lines, -33 removed lines

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

Classes/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/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.

Classes/Module/VidiModule.php

Indentation +29 added lines, -29 removed lines

@@ -16,33 +16,33 @@
  */
 class VidiModule
 {
-    public const SIGNATURE = 'file_VidiSysFileM1';
-    public const PARAMETER_PREFIX = 'tx_vidi_file_vidisysfilem1';
-
-    public const SIGNATURE_FOLDER_TREE_OMITTED = 'content_VidiSysFileM1';
-    public const PARAMETER_PREFIX_FOLDER_TREE_OMITTED = 'tx_vidi_content_vidisysfilem1';
-
-    /**
-     * @return string
-     */
-    public static function getSignature()
-    {
-        return self::getMediaModule()->hasFolderTree() ? self::SIGNATURE : self::SIGNATURE_FOLDER_TREE_OMITTED;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getParameterPrefix()
-    {
-        return self::getMediaModule()->hasFolderTree() ? self::PARAMETER_PREFIX : self::PARAMETER_PREFIX_FOLDER_TREE_OMITTED;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected static function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	public const SIGNATURE = 'file_VidiSysFileM1';
+	public const PARAMETER_PREFIX = 'tx_vidi_file_vidisysfilem1';
+
+	public const SIGNATURE_FOLDER_TREE_OMITTED = 'content_VidiSysFileM1';
+	public const PARAMETER_PREFIX_FOLDER_TREE_OMITTED = 'tx_vidi_content_vidisysfilem1';
+
+	/**
+	 * @return string
+	 */
+	public static function getSignature()
+	{
+		return self::getMediaModule()->hasFolderTree() ? self::SIGNATURE : self::SIGNATURE_FOLDER_TREE_OMITTED;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getParameterPrefix()
+	{
+		return self::getMediaModule()->hasFolderTree() ? self::PARAMETER_PREFIX : self::PARAMETER_PREFIX_FOLDER_TREE_OMITTED;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected static function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 }

Classes/Dimension.php

Indentation +35 added lines, -35 removed lines

@@ -16,39 +16,39 @@
  */
 class Dimension
 {
-    /**
-     * @var int
-     */
-    protected $width = 0;
-
-    /**
-     * @var int
-     */
-    protected $height = 0;
-
-    /**
-     * @param string $dimension
-     */
-    public function __construct($dimension)
-    {
-        $dimensions = GeneralUtility::trimExplode('x', $dimension);
-        $this->width = empty($dimensions[0]) ? 0 : $dimensions[0];
-        $this->height = empty($dimensions[1]) ? 0 : $dimensions[1];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getWidth()
-    {
-        return $this->width;
-    }
-
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->height;
-    }
+	/**
+	 * @var int
+	 */
+	protected $width = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $height = 0;
+
+	/**
+	 * @param string $dimension
+	 */
+	public function __construct($dimension)
+	{
+		$dimensions = GeneralUtility::trimExplode('x', $dimension);
+		$this->width = empty($dimensions[0]) ? 0 : $dimensions[0];
+		$this->height = empty($dimensions[1]) ? 0 : $dimensions[1];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getWidth()
+	{
+		return $this->width;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		return $this->height;
+	}
 }

Classes/FileUpload/FormUtility.php

Indentation +45 added lines, -45 removed lines

@@ -16,53 +16,53 @@
  */
 class FormUtility implements SingletonInterface
 {
-    /**
-     * Returns a class instance.
-     *
-     * @return \Fab\Media\FileUpload\FormUtility|object
-     */
-    public static function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\FileUpload\FormUtility::class);
-    }
+	/**
+	 * Returns a class instance.
+	 *
+	 * @return \Fab\Media\FileUpload\FormUtility|object
+	 */
+	public static function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\FileUpload\FormUtility::class);
+	}
 
-    /**
-     * Tells whether the content type is valid.
-     *
-     * @return bool
-     */
-    public function hasValidContentType()
-    {
-        return isset($GLOBALS['_SERVER']['CONTENT_TYPE']);
-    }
+	/**
+	 * Tells whether the content type is valid.
+	 *
+	 * @return bool
+	 */
+	public function hasValidContentType()
+	{
+		return isset($GLOBALS['_SERVER']['CONTENT_TYPE']);
+	}
 
-    /**
-     * Tells whether the form is multiparted, e.g "multipart/form-data"
-     *
-     * @return bool
-     */
-    public function isMultiparted()
-    {
-        return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'multipart/form-data') === 0;
-    }
+	/**
+	 * Tells whether the form is multiparted, e.g "multipart/form-data"
+	 *
+	 * @return bool
+	 */
+	public function isMultiparted()
+	{
+		return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'multipart/form-data') === 0;
+	}
 
-    /**
-     * Tells whether the form is URL encoded, e.g "application/x-www-form-urlencoded; charset=UTF-8"
-     *
-     * @return bool
-     */
-    public function isUrlEncoded()
-    {
-        return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/x-www-form-urlencoded') === 0;
-    }
+	/**
+	 * Tells whether the form is URL encoded, e.g "application/x-www-form-urlencoded; charset=UTF-8"
+	 *
+	 * @return bool
+	 */
+	public function isUrlEncoded()
+	{
+		return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/x-www-form-urlencoded') === 0;
+	}
 
-    /**
-     * Tells whether the form is octet streamed, e.g "application/x-www-form-urlencoded; charset=UTF-8"
-     *
-     * @return bool
-     */
-    public function isOctetStreamed()
-    {
-        return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/octet-stream') === 0;
-    }
+	/**
+	 * Tells whether the form is octet streamed, e.g "application/x-www-form-urlencoded; charset=UTF-8"
+	 *
+	 * @return bool
+	 */
+	public function isOctetStreamed()
+	{
+		return strpos(strtolower($GLOBALS['_SERVER']['CONTENT_TYPE']), 'application/octet-stream') === 0;
+	}
 }

Classes/FileUpload/ImageOptimizerInterface.php

Indentation +7 added lines, -7 removed lines

@@ -14,11 +14,11 @@
  */
 interface ImageOptimizerInterface
 {
-    /**
-     * Optimize the given uploaded image
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return UploadedFileInterface
-     */
-    public function optimize($uploadedFile);
+	/**
+	 * Optimize the given uploaded image
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return UploadedFileInterface
+	 */
+	public function optimize($uploadedFile);
 }