fabarea / media

Classes/Security/FilePermissionsAspect.php

Indentation +203 added lines, -203 removed lines

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

Classes/Thumbnail/ThumbnailGenerator.php

Indentation +244 added lines, -244 removed lines

@@ -22,248 +22,248 @@
 class ThumbnailGenerator
 {
 
-    /**
-     * @var int
-     */
-    protected $numberOfTraversedFiles = 0;
-
-    /**
-     * @var int
-     */
-    protected $numberOfProcessedFiles = 0;
-
-    /**
-     * @var int
-     */
-    protected $numberOfMissingFiles = 0;
-
-    /**
-     * @var array
-     */
-    protected $configuration = [];
-
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage = null;
-
-    /**
-     * @var Selection
-     */
-    protected $selection = null;
-
-    /**
-     * @var array
-     */
-    protected $resultSet = [];
-
-    /**
-     * @var array
-     */
-    protected $newProcessedFileIdentifiers = [];
-
-    /**
-     * Internal variable
-     *
-     * @var int
-     */
-    protected $lastInsertedProcessedFile = 0;
-
-    /**
-     * Generate
-     *
-     * @param int $limit
-     * @param int $offset
-     * @return void
-     * @throws \TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException
-     * @throws \InvalidArgumentException
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @throws \Fab\Media\Exception\MissingTcaConfigurationException
-     */
-    public function generate($limit = 0, $offset = 0)
-    {
-
-        // Compute a possible limit and offset for the query.
-        //$limitAndOffset = '';
-        //if ($limit > 0 || $offset > 0) {
-        //    $limitAndOffset = $limit . ' OFFSET ' . $offset;
-        //}
-
-        $rows = $this->getDataService()
-            ->getRecords(
-                'sys_file',
-                [
-                    'storage' => $this->storage->getUid()
-                ] // todo add limit and offset
-            );
-
-        foreach ($rows as $row) {
-
-
-            $file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
-
-            if ($file->exists()) {
-
-                $thumbnailUri = $this->getThumbnailService($file)
-                    ->setOutputType(ThumbnailInterface::OUTPUT_URI)
-                    ->setConfiguration($this->configuration)
-                    ->create();
-
-                $this->resultSet[$file->getUid()] = array(
-                    'fileUid' => $file->getUid(),
-                    'fileIdentifier' => $file->getIdentifier(),
-                    'thumbnailUri' => strpos($thumbnailUri, '_processed_') > 0 ? $thumbnailUri : '', // only returns the thumbnail uri if a processed file has been created.
-                );
-
-                //if ($this->isNewProcessedFile()) { // todo restore me
-                //    $this->incrementNumberOfProcessedFiles();
-                //   $this->newProcessedFileIdentifiers[$file->getUid()] = $this->lastInsertedProcessedFile;
-                //}
-
-                $this->incrementNumberOfTraversedFiles();
-            } else {
-                $this->incrementNumberOfMissingFiles();
-            }
-        }
-
-    }
-
-    /**
-     * @return int
-     */
-    protected function isNewProcessedFile()
-    {
-        $isNewProcessedFile = false;
-        $lastInsertedId = $this->getDatabaseConnection()->sql_insert_id();
-        if ($lastInsertedId > 0 && $lastInsertedId !== $this->lastInsertedProcessedFile) {
-            $this->lastInsertedProcessedFile = $lastInsertedId;
-            $isNewProcessedFile = true;
-        }
-        return $isNewProcessedFile;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfTraversedFiles()
-    {
-        return $this->numberOfTraversedFiles;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfProcessedFiles()
-    {
-        return $this->numberOfProcessedFiles;
-    }
-
-    /**
-     * @return int
-     */
-    public function getTotalNumberOfFiles()
-    {
-        return $this->getDataService()
-            ->count(
-                'sys_file',
-                [
-                    'storage' => $this->storage->getUid()
-                ]
-            );
-    }
-
-    /**
-     * @return array
-     */
-    public function getResultSet()
-    {
-        return $this->resultSet;
-    }
-
-    /**
-     * @return array
-     */
-    public function getNewProcessedFileIdentifiers()
-    {
-        return $this->newProcessedFileIdentifiers;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfMissingFiles()
-    {
-        return $this->numberOfMissingFiles;
-    }
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return $this
-     */
-    public function setStorage($storage)
-    {
-        $this->storage = $storage;
-        return $this;
-    }
-
-    /**
-     * @param \Fab\Vidi\Domain\Model\Selection $selection
-     * @return $this
-     */
-    public function setSelection($selection)
-    {
-        $this->selection = $selection;
-        return $this;
-    }
-
-    /**
-     * @param array $configuration
-     * @return $this
-     */
-    public function setConfiguration($configuration)
-    {
-        $this->configuration = $configuration;
-        return $this;
-    }
-
-    /**
-     * @param File $file
-     * @return object|ThumbnailService
-     */
-    protected function getThumbnailService(File $file)
-    {
-        return GeneralUtility::makeInstance(ThumbnailService::class, $file);
-    }
-
-    /**
-     * @return void
-     */
-    protected function incrementNumberOfTraversedFiles()
-    {
-        $this->numberOfTraversedFiles++;
-    }
-
-    /**
-     * @return void
-     */
-    protected function incrementNumberOfMissingFiles()
-    {
-        $this->numberOfMissingFiles++;
-    }
-
-    /**
-     * @return void
-     */
-    protected function incrementNumberOfProcessedFiles()
-    {
-        $this->numberOfProcessedFiles++;
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * @var int
+	 */
+	protected $numberOfTraversedFiles = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $numberOfProcessedFiles = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $numberOfMissingFiles = 0;
+
+	/**
+	 * @var array
+	 */
+	protected $configuration = [];
+
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage = null;
+
+	/**
+	 * @var Selection
+	 */
+	protected $selection = null;
+
+	/**
+	 * @var array
+	 */
+	protected $resultSet = [];
+
+	/**
+	 * @var array
+	 */
+	protected $newProcessedFileIdentifiers = [];
+
+	/**
+	 * Internal variable
+	 *
+	 * @var int
+	 */
+	protected $lastInsertedProcessedFile = 0;
+
+	/**
+	 * Generate
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @return void
+	 * @throws \TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException
+	 * @throws \InvalidArgumentException
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @throws \Fab\Media\Exception\MissingTcaConfigurationException
+	 */
+	public function generate($limit = 0, $offset = 0)
+	{
+
+		// Compute a possible limit and offset for the query.
+		//$limitAndOffset = '';
+		//if ($limit > 0 || $offset > 0) {
+		//    $limitAndOffset = $limit . ' OFFSET ' . $offset;
+		//}
+
+		$rows = $this->getDataService()
+			->getRecords(
+				'sys_file',
+				[
+					'storage' => $this->storage->getUid()
+				] // todo add limit and offset
+			);
+
+		foreach ($rows as $row) {
+
+
+			$file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
+
+			if ($file->exists()) {
+
+				$thumbnailUri = $this->getThumbnailService($file)
+					->setOutputType(ThumbnailInterface::OUTPUT_URI)
+					->setConfiguration($this->configuration)
+					->create();
+
+				$this->resultSet[$file->getUid()] = array(
+					'fileUid' => $file->getUid(),
+					'fileIdentifier' => $file->getIdentifier(),
+					'thumbnailUri' => strpos($thumbnailUri, '_processed_') > 0 ? $thumbnailUri : '', // only returns the thumbnail uri if a processed file has been created.
+				);
+
+				//if ($this->isNewProcessedFile()) { // todo restore me
+				//    $this->incrementNumberOfProcessedFiles();
+				//   $this->newProcessedFileIdentifiers[$file->getUid()] = $this->lastInsertedProcessedFile;
+				//}
+
+				$this->incrementNumberOfTraversedFiles();
+			} else {
+				$this->incrementNumberOfMissingFiles();
+			}
+		}
+
+	}
+
+	/**
+	 * @return int
+	 */
+	protected function isNewProcessedFile()
+	{
+		$isNewProcessedFile = false;
+		$lastInsertedId = $this->getDatabaseConnection()->sql_insert_id();
+		if ($lastInsertedId > 0 && $lastInsertedId !== $this->lastInsertedProcessedFile) {
+			$this->lastInsertedProcessedFile = $lastInsertedId;
+			$isNewProcessedFile = true;
+		}
+		return $isNewProcessedFile;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfTraversedFiles()
+	{
+		return $this->numberOfTraversedFiles;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfProcessedFiles()
+	{
+		return $this->numberOfProcessedFiles;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTotalNumberOfFiles()
+	{
+		return $this->getDataService()
+			->count(
+				'sys_file',
+				[
+					'storage' => $this->storage->getUid()
+				]
+			);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getResultSet()
+	{
+		return $this->resultSet;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getNewProcessedFileIdentifiers()
+	{
+		return $this->newProcessedFileIdentifiers;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfMissingFiles()
+	{
+		return $this->numberOfMissingFiles;
+	}
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return $this
+	 */
+	public function setStorage($storage)
+	{
+		$this->storage = $storage;
+		return $this;
+	}
+
+	/**
+	 * @param \Fab\Vidi\Domain\Model\Selection $selection
+	 * @return $this
+	 */
+	public function setSelection($selection)
+	{
+		$this->selection = $selection;
+		return $this;
+	}
+
+	/**
+	 * @param array $configuration
+	 * @return $this
+	 */
+	public function setConfiguration($configuration)
+	{
+		$this->configuration = $configuration;
+		return $this;
+	}
+
+	/**
+	 * @param File $file
+	 * @return object|ThumbnailService
+	 */
+	protected function getThumbnailService(File $file)
+	{
+		return GeneralUtility::makeInstance(ThumbnailService::class, $file);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function incrementNumberOfTraversedFiles()
+	{
+		$this->numberOfTraversedFiles++;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function incrementNumberOfMissingFiles()
+	{
+		$this->numberOfMissingFiles++;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function incrementNumberOfProcessedFiles()
+	{
+		$this->numberOfProcessedFiles++;
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 }

Classes/Resource/FileReferenceService.php

Indentation +160 added lines, -160 removed lines

@@ -20,164 +20,164 @@
  */
 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/Module/MediaModule.php

Indentation +335 added lines, -335 removed lines

@@ -26,340 +26,340 @@
 class MediaModule implements SingletonInterface
 {
 
-    /**
-     * @var string
-     */
-    const SIGNATURE = 'user_MediaM1';
-
-    /**
-     * @var string
-     */
-    const PARAMETER_PREFIX = 'tx_media_user_mediam1';
-
-    /**
-     * @var ResourceStorage
-     */
-    protected $currentStorage;
-
-    /**
-     * @return string
-     */
-    static public function getSignature()
-    {
-        return self::SIGNATURE;
-    }
-
-    /**
-     * @return string
-     */
-    static public 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 = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
-            } else {
-
-                // We differentiate the cases whether the User is admin or not.
-                if ($this->getBackendUser()->isAdmin()) {
-
-                    $currentStorage = ResourceFactory::getInstance()->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(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-
-                        $storages = $storageRepository->findAll();
-                        $currentStorage = current($storages);
-                    }
-                } else {
-                    $fileMounts = $this->getBackendUser()->getFileMountRecords();
-                    $firstFileMount = current($fileMounts);
-                    $currentStorage = ResourceFactory::getInstance()->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 = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-        $identifier = substr($combinedIdentifier, strpos($combinedIdentifier, ':') + 1);
-        if (!$storage->hasFolder($identifier)) {
-            $identifier = $storage->getFolderIdentifierFromFileIdentifier($identifier);
-        }
-
-        // Retrieve the folder object.
-        $folder = ResourceFactory::getInstance()->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 = ResourceFactory::getInstance()->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 \TYPO3\CMS\Core\Resource\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 \TYPO3\CMS\Core\Resource\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 \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Return the module loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	/**
+	 * @var string
+	 */
+	const SIGNATURE = 'user_MediaM1';
+
+	/**
+	 * @var string
+	 */
+	const PARAMETER_PREFIX = 'tx_media_user_mediam1';
+
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $currentStorage;
+
+	/**
+	 * @return string
+	 */
+	static public function getSignature()
+	{
+		return self::SIGNATURE;
+	}
+
+	/**
+	 * @return string
+	 */
+	static public 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 = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
+			} else {
+
+				// We differentiate the cases whether the User is admin or not.
+				if ($this->getBackendUser()->isAdmin()) {
+
+					$currentStorage = ResourceFactory::getInstance()->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(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+
+						$storages = $storageRepository->findAll();
+						$currentStorage = current($storages);
+					}
+				} else {
+					$fileMounts = $this->getBackendUser()->getFileMountRecords();
+					$firstFileMount = current($fileMounts);
+					$currentStorage = ResourceFactory::getInstance()->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 = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+		$identifier = substr($combinedIdentifier, strpos($combinedIdentifier, ':') + 1);
+		if (!$storage->hasFolder($identifier)) {
+			$identifier = $storage->getFolderIdentifierFromFileIdentifier($identifier);
+		}
+
+		// Retrieve the folder object.
+		$folder = ResourceFactory::getInstance()->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 = ResourceFactory::getInstance()->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 \TYPO3\CMS\Core\Resource\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 \TYPO3\CMS\Core\Resource\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 \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Return the module loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 
 }
\ No newline at end of file

Classes/Command/DuplicateFilesCommandController.php

Indentation +186 added lines, -186 removed lines

@@ -18,191 +18,191 @@
 class DuplicateFilesCommandController extends CommandController
 {
 
-    /**
-     * @var array
-     */
-    protected $message = [];
-
-    /**
-     * @var array
-     */
-    protected $duplicateFiles = [];
-
-    /**
-     * @var \TYPO3\CMS\Core\Mail\MailMessage
-     */
-    protected $mailMessage;
-
-    /**
-     * Check whether the Index is Ok. In case not, display a message on the console.
-     *
-     * @return void
-     */
-    public function analyseCommand()
-    {
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // For the CLI cause.
-            $storage->setEvaluatePermissions(false);
-
-            $this->printOut();
-            $this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-            $this->printOut('--------------------------------------------');
-
-            if ($storage->isOnline()) {
-
-                $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
-
-                // Duplicate file object
-                if (empty($duplicateFiles)) {
-                    $this->printOut();
-                    $this->printOut('Looks good, no duplicate files!');
-                } else {
-                    $this->printOut();
-                    $this->printOut('Duplicated identifiers detected:');
-                    $this->duplicateFiles[$storage->getUid()] = $duplicateFiles; // Store duplicate files.
-
-                    foreach ($duplicateFiles as $identifier => $duplicate) {
-
-                        // build temporary array
-                        $uids = [];
-                        foreach ($duplicate as $value) {
-                            $uids[] = $value['uid'];
-                        }
-
-                        $message = sprintf('* uids "%s" having same sha1 %s',
-                            implode(',', $uids),
-                            $identifier
-                        );
-                        $this->printOut($message);
-
-                    }
-                }
-            } else {
-                $this->outputLine('Storage is offline!');
-            }
-        }
-
-        $to = $this->getTo();
-        if (!empty($to)) {
-            $this->sendReport();
-        }
-    }
-
-    /**
-     * Print a message and store its content in a variable for the email report.
-     *
-     * @param string $message
-     * @return void
-     */
-    protected function printOut($message = '')
-    {
-        $this->message[] = $message;
-        $this->outputLine($message);
-    }
-
-    /**
-     * Send a possible report to an admin.
-     *
-     * @throws \Exception
-     * @return void
-     */
-    protected function sendReport()
-    {
-        if ($this->hasReport()) {
-
-            // Prepare email.
-            $this->getMailMessage()->setTo($this->getTo())
-                ->setFrom($this->getFrom())
-                ->setSubject('Duplicate records detected!')
-                ->setBody(implode("\n", $this->message));
-
-            $isSent = $this->getMailMessage()->send();
-
-            if (!$isSent) {
-                throw new \Exception('I could not send a message', 1408343882);
-            }
-
-            $to = $this->getTo();
-            $this->outputLine();
-            $message = sprintf('Report was sent to %s', key($to));
-            $this->outputLine($message);
-        }
-    }
-
-    /**
-     * Send a report
-     *
-     * @return bool
-     */
-    protected function hasReport()
-    {
-        return !empty($this->duplicateFiles);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTo()
-    {
-
-        $to = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $to[$emailAddress] = $name;
-
-        }
-        return $to;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getFrom()
-    {
-
-        $from = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $from[$emailAddress] = $name;
-        }
-        return $from;
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\Mail\MailMessage|object
-     */
-    public function getMailMessage()
-    {
-        if (is_null($this->mailMessage)) {
-            $this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
-        }
-        return $this->mailMessage;
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $message = [];
+
+	/**
+	 * @var array
+	 */
+	protected $duplicateFiles = [];
+
+	/**
+	 * @var \TYPO3\CMS\Core\Mail\MailMessage
+	 */
+	protected $mailMessage;
+
+	/**
+	 * Check whether the Index is Ok. In case not, display a message on the console.
+	 *
+	 * @return void
+	 */
+	public function analyseCommand()
+	{
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// For the CLI cause.
+			$storage->setEvaluatePermissions(false);
+
+			$this->printOut();
+			$this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+			$this->printOut('--------------------------------------------');
+
+			if ($storage->isOnline()) {
+
+				$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
+
+				// Duplicate file object
+				if (empty($duplicateFiles)) {
+					$this->printOut();
+					$this->printOut('Looks good, no duplicate files!');
+				} else {
+					$this->printOut();
+					$this->printOut('Duplicated identifiers detected:');
+					$this->duplicateFiles[$storage->getUid()] = $duplicateFiles; // Store duplicate files.
+
+					foreach ($duplicateFiles as $identifier => $duplicate) {
+
+						// build temporary array
+						$uids = [];
+						foreach ($duplicate as $value) {
+							$uids[] = $value['uid'];
+						}
+
+						$message = sprintf('* uids "%s" having same sha1 %s',
+							implode(',', $uids),
+							$identifier
+						);
+						$this->printOut($message);
+
+					}
+				}
+			} else {
+				$this->outputLine('Storage is offline!');
+			}
+		}
+
+		$to = $this->getTo();
+		if (!empty($to)) {
+			$this->sendReport();
+		}
+	}
+
+	/**
+	 * Print a message and store its content in a variable for the email report.
+	 *
+	 * @param string $message
+	 * @return void
+	 */
+	protected function printOut($message = '')
+	{
+		$this->message[] = $message;
+		$this->outputLine($message);
+	}
+
+	/**
+	 * Send a possible report to an admin.
+	 *
+	 * @throws \Exception
+	 * @return void
+	 */
+	protected function sendReport()
+	{
+		if ($this->hasReport()) {
+
+			// Prepare email.
+			$this->getMailMessage()->setTo($this->getTo())
+				->setFrom($this->getFrom())
+				->setSubject('Duplicate records detected!')
+				->setBody(implode("\n", $this->message));
+
+			$isSent = $this->getMailMessage()->send();
+
+			if (!$isSent) {
+				throw new \Exception('I could not send a message', 1408343882);
+			}
+
+			$to = $this->getTo();
+			$this->outputLine();
+			$message = sprintf('Report was sent to %s', key($to));
+			$this->outputLine($message);
+		}
+	}
+
+	/**
+	 * Send a report
+	 *
+	 * @return bool
+	 */
+	protected function hasReport()
+	{
+		return !empty($this->duplicateFiles);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getTo()
+	{
+
+		$to = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$to[$emailAddress] = $name;
+
+		}
+		return $to;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getFrom()
+	{
+
+		$from = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$from[$emailAddress] = $name;
+		}
+		return $from;
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\Mail\MailMessage|object
+	 */
+	public function getMailMessage()
+	{
+		if (is_null($this->mailMessage)) {
+			$this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
+		}
+		return $this->mailMessage;
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
 
 }

Classes/Command/MissingFilesCommandController.php

Indentation +226 added lines, -226 removed lines

@@ -18,231 +18,231 @@
 class MissingFilesCommandController extends CommandController
 {
 
-    /**
-     * @var array
-     */
-    protected $message = [];
-
-    /**
-     * @var array
-     */
-    protected $missingFiles = [];
-
-    /**
-     * @var array
-     */
-    protected $deletedFiles = [];
-
-    /**
-     * @var \TYPO3\CMS\Core\Mail\MailMessage
-     */
-    protected $mailMessage;
-
-    /**
-     * Check whether the Index is Ok. In case not, display a message on the console.
-     *
-     * @return void
-     */
-    public function analyseCommand()
-    {
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // For the CLI cause.
-            $storage->setEvaluatePermissions(false);
-
-            $this->printOut();
-            $this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-            $this->printOut('--------------------------------------------');
-
-            if ($storage->isOnline()) {
-
-                $missingFiles = $this->getIndexAnalyser()->searchForMissingFiles($storage);
-                if (empty($missingFiles)) {
-                    $this->printOut();
-                    $this->printOut('Looks good, no missing files!');
-                } else {
-                    // Missing files...
-                    $this->printOut();
-                    $this->printOut('Missing resources:');
-                    $this->missingFiles[$storage->getUid()] = $missingFiles; // Store missing files.
-
-                    /** @var \TYPO3\CMS\Core\Resource\File $missingFile */
-                    foreach ($missingFiles as $missingFile) {
-                        $message = sprintf('* Missing file "%s" with identifier "%s".',
-                            $missingFile->getUid(),
-                            $missingFile->getIdentifier()
-                        );
-                        $this->printOut($message);
-                    }
-                }
-
-            } else {
-                $this->outputLine('Storage is offline!');
-            }
-        }
-
-        $to = $this->getTo();
-        if (!empty($to)) {
-            $this->sendReport();
-        }
-    }
-
-    /**
-     * Delete the missing files which have no file references
-     *
-     * @return void
-     */
-    public function deleteCommand()
-    {
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // For the CLI cause.
-            $storage->setEvaluatePermissions(false);
-
-            $this->printOut();
-            $this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-            $this->printOut('--------------------------------------------');
-
-            if ($storage->isOnline()) {
-
-                $deletedFiles = $this->getIndexAnalyser()->deleteMissingFiles($storage);
-                if (empty($deletedFiles)) {
-                    $this->printOut();
-                    $this->printOut('No files deleted!');
-                } else {
-                    // Missing files...
-                    $this->printOut();
-                    $this->printOut('Deleted Files:');
-                    /** @var \TYPO3\CMS\Core\Resource\File $deletedFile */
-                    foreach ($deletedFiles as $deletedFileUid => $deletedFileIdentifier) {
-                        $message = sprintf('* Deleted file "%s" with identifier "%s".',
-                            $deletedFileUid,
-                            $deletedFileIdentifier
-                        );
-                        $this->printOut($message);
-                    }
-                }
-
-            } else {
-                $this->outputLine('Storage is offline!');
-            }
-        }
-    }
-
-    /**
-     * Print a message and store its content in a variable for the email report.
-     *
-     * @param string $message
-     * @return void
-     */
-    protected function printOut($message = '')
-    {
-        $this->message[] = $message;
-        $this->outputLine($message);
-    }
-
-    /**
-     * Send a possible report to an admin.
-     *
-     * @throws \Exception
-     * @return void
-     */
-    protected function sendReport()
-    {
-        if ($this->hasReport()) {
-
-            // Prepare email.
-            $this->getMailMessage()->setTo($this->getTo())
-                ->setFrom($this->getFrom())
-                ->setSubject('Missing files detected!')
-                ->setBody(implode("\n", $this->message));
-
-            $isSent = $this->getMailMessage()->send();
-
-            if (!$isSent) {
-                throw new \Exception('I could not send a message', 1408343882);
-            }
-
-            $to = $this->getTo();
-            $this->outputLine();
-            $message = sprintf('Report was sent to %s', key($to));
-            $this->outputLine($message);
-        }
-    }
-
-    /**
-     * Send a report
-     *
-     * @return bool
-     */
-    protected function hasReport()
-    {
-        return !empty($this->missingFiles);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTo()
-    {
-
-        $to = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $to[$emailAddress] = $name;
-
-        }
-        return $to;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getFrom()
-    {
-        $from = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $from[$emailAddress] = $name;
-        }
-        return $from;
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\Mail\MailMessage
-     */
-    public function getMailMessage()
-    {
-        if (is_null($this->mailMessage)) {
-            $this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
-        }
-        return $this->mailMessage;
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $message = [];
+
+	/**
+	 * @var array
+	 */
+	protected $missingFiles = [];
+
+	/**
+	 * @var array
+	 */
+	protected $deletedFiles = [];
+
+	/**
+	 * @var \TYPO3\CMS\Core\Mail\MailMessage
+	 */
+	protected $mailMessage;
+
+	/**
+	 * Check whether the Index is Ok. In case not, display a message on the console.
+	 *
+	 * @return void
+	 */
+	public function analyseCommand()
+	{
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// For the CLI cause.
+			$storage->setEvaluatePermissions(false);
+
+			$this->printOut();
+			$this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+			$this->printOut('--------------------------------------------');
+
+			if ($storage->isOnline()) {
+
+				$missingFiles = $this->getIndexAnalyser()->searchForMissingFiles($storage);
+				if (empty($missingFiles)) {
+					$this->printOut();
+					$this->printOut('Looks good, no missing files!');
+				} else {
+					// Missing files...
+					$this->printOut();
+					$this->printOut('Missing resources:');
+					$this->missingFiles[$storage->getUid()] = $missingFiles; // Store missing files.
+
+					/** @var \TYPO3\CMS\Core\Resource\File $missingFile */
+					foreach ($missingFiles as $missingFile) {
+						$message = sprintf('* Missing file "%s" with identifier "%s".',
+							$missingFile->getUid(),
+							$missingFile->getIdentifier()
+						);
+						$this->printOut($message);
+					}
+				}
+
+			} else {
+				$this->outputLine('Storage is offline!');
+			}
+		}
+
+		$to = $this->getTo();
+		if (!empty($to)) {
+			$this->sendReport();
+		}
+	}
+
+	/**
+	 * Delete the missing files which have no file references
+	 *
+	 * @return void
+	 */
+	public function deleteCommand()
+	{
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// For the CLI cause.
+			$storage->setEvaluatePermissions(false);
+
+			$this->printOut();
+			$this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+			$this->printOut('--------------------------------------------');
+
+			if ($storage->isOnline()) {
+
+				$deletedFiles = $this->getIndexAnalyser()->deleteMissingFiles($storage);
+				if (empty($deletedFiles)) {
+					$this->printOut();
+					$this->printOut('No files deleted!');
+				} else {
+					// Missing files...
+					$this->printOut();
+					$this->printOut('Deleted Files:');
+					/** @var \TYPO3\CMS\Core\Resource\File $deletedFile */
+					foreach ($deletedFiles as $deletedFileUid => $deletedFileIdentifier) {
+						$message = sprintf('* Deleted file "%s" with identifier "%s".',
+							$deletedFileUid,
+							$deletedFileIdentifier
+						);
+						$this->printOut($message);
+					}
+				}
+
+			} else {
+				$this->outputLine('Storage is offline!');
+			}
+		}
+	}
+
+	/**
+	 * Print a message and store its content in a variable for the email report.
+	 *
+	 * @param string $message
+	 * @return void
+	 */
+	protected function printOut($message = '')
+	{
+		$this->message[] = $message;
+		$this->outputLine($message);
+	}
+
+	/**
+	 * Send a possible report to an admin.
+	 *
+	 * @throws \Exception
+	 * @return void
+	 */
+	protected function sendReport()
+	{
+		if ($this->hasReport()) {
+
+			// Prepare email.
+			$this->getMailMessage()->setTo($this->getTo())
+				->setFrom($this->getFrom())
+				->setSubject('Missing files detected!')
+				->setBody(implode("\n", $this->message));
+
+			$isSent = $this->getMailMessage()->send();
+
+			if (!$isSent) {
+				throw new \Exception('I could not send a message', 1408343882);
+			}
+
+			$to = $this->getTo();
+			$this->outputLine();
+			$message = sprintf('Report was sent to %s', key($to));
+			$this->outputLine($message);
+		}
+	}
+
+	/**
+	 * Send a report
+	 *
+	 * @return bool
+	 */
+	protected function hasReport()
+	{
+		return !empty($this->missingFiles);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getTo()
+	{
+
+		$to = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$to[$emailAddress] = $name;
+
+		}
+		return $to;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getFrom()
+	{
+		$from = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$from[$emailAddress] = $name;
+		}
+		return $from;
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\Mail\MailMessage
+	 */
+	public function getMailMessage()
+	{
+		if (is_null($this->mailMessage)) {
+			$this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
+		}
+		return $this->mailMessage;
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
 
 }

Classes/Command/DuplicateRecordsCommandController.php

Indentation +186 added lines, -186 removed lines

@@ -18,191 +18,191 @@
 class DuplicateRecordsCommandController extends CommandController
 {
 
-    /**
-     * @var array
-     */
-    protected $message = [];
-
-    /**
-     * @var array
-     */
-    protected $duplicateRecords = [];
-
-    /**
-     * @var \TYPO3\CMS\Core\Mail\MailMessage
-     */
-    protected $mailMessage;
-
-    /**
-     * Check whether the Index is Ok. In case not, display a message on the console.
-     *
-     * @return void
-     */
-    public function analyseCommand()
-    {
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // For the CLI cause.
-            $storage->setEvaluatePermissions(false);
-
-            $this->printOut();
-            $this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-            $this->printOut('--------------------------------------------');
-
-            if ($storage->isOnline()) {
-
-                $duplicateRecords = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
-
-                // Duplicate file object
-                if (empty($duplicateRecords)) {
-                    $this->printOut();
-                    $this->printOut('Looks good, no duplicate records!');
-                } else {
-                    $this->printOut();
-                    $this->printOut('Duplicated identifiers detected:');
-                    $this->duplicateRecords[$storage->getUid()] = $duplicateRecords; // Store duplicate files.
-
-                    foreach ($duplicateRecords as $identifier => $duplicate) {
-
-                        // build temporary array
-                        $uids = [];
-                        foreach ($duplicate as $value) {
-                            $uids[] = $value['uid'];
-                        }
-
-                        $message = sprintf('* uids "%s" having same identifier %s',
-                            implode(',', $uids),
-                            $identifier
-                        );
-                        $this->printOut($message);
-
-                    }
-                }
-            } else {
-                $this->outputLine('Storage is offline!');
-            }
-        }
-
-        $to = $this->getTo();
-        if (!empty($to)) {
-            $this->sendReport();
-        }
-    }
-
-    /**
-     * Print a message and store its content in a variable for the email report.
-     *
-     * @param string $message
-     * @return void
-     */
-    protected function printOut($message = '')
-    {
-        $this->message[] = $message;
-        $this->outputLine($message);
-    }
-
-    /**
-     * Send a possible report to an admin.
-     *
-     * @throws \Exception
-     * @return void
-     */
-    protected function sendReport()
-    {
-        if ($this->hasReport()) {
-
-            // Prepare email.
-            $this->getMailMessage()->setTo($this->getTo())
-                ->setFrom($this->getFrom())
-                ->setSubject('Duplicate records detected!')
-                ->setBody(implode("\n", $this->message));
-
-            $isSent = $this->getMailMessage()->send();
-
-            if (!$isSent) {
-                throw new \Exception('I could not send a message', 1408343882);
-            }
-
-            $to = $this->getTo();
-            $this->outputLine();
-            $message = sprintf('Report was sent to %s', key($to));
-            $this->outputLine($message);
-        }
-    }
-
-    /**
-     * Send a report
-     *
-     * @return bool
-     */
-    protected function hasReport()
-    {
-        return !empty($this->duplicateRecords);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTo()
-    {
-
-        $to = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $to[$emailAddress] = $name;
-
-        }
-        return $to;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getFrom()
-    {
-
-        $from = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $from[$emailAddress] = $name;
-        }
-        return $from;
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\Mail\MailMessage|object
-     */
-    public function getMailMessage()
-    {
-        if (is_null($this->mailMessage)) {
-            $this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
-        }
-        return $this->mailMessage;
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $message = [];
+
+	/**
+	 * @var array
+	 */
+	protected $duplicateRecords = [];
+
+	/**
+	 * @var \TYPO3\CMS\Core\Mail\MailMessage
+	 */
+	protected $mailMessage;
+
+	/**
+	 * Check whether the Index is Ok. In case not, display a message on the console.
+	 *
+	 * @return void
+	 */
+	public function analyseCommand()
+	{
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// For the CLI cause.
+			$storage->setEvaluatePermissions(false);
+
+			$this->printOut();
+			$this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+			$this->printOut('--------------------------------------------');
+
+			if ($storage->isOnline()) {
+
+				$duplicateRecords = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
+
+				// Duplicate file object
+				if (empty($duplicateRecords)) {
+					$this->printOut();
+					$this->printOut('Looks good, no duplicate records!');
+				} else {
+					$this->printOut();
+					$this->printOut('Duplicated identifiers detected:');
+					$this->duplicateRecords[$storage->getUid()] = $duplicateRecords; // Store duplicate files.
+
+					foreach ($duplicateRecords as $identifier => $duplicate) {
+
+						// build temporary array
+						$uids = [];
+						foreach ($duplicate as $value) {
+							$uids[] = $value['uid'];
+						}
+
+						$message = sprintf('* uids "%s" having same identifier %s',
+							implode(',', $uids),
+							$identifier
+						);
+						$this->printOut($message);
+
+					}
+				}
+			} else {
+				$this->outputLine('Storage is offline!');
+			}
+		}
+
+		$to = $this->getTo();
+		if (!empty($to)) {
+			$this->sendReport();
+		}
+	}
+
+	/**
+	 * Print a message and store its content in a variable for the email report.
+	 *
+	 * @param string $message
+	 * @return void
+	 */
+	protected function printOut($message = '')
+	{
+		$this->message[] = $message;
+		$this->outputLine($message);
+	}
+
+	/**
+	 * Send a possible report to an admin.
+	 *
+	 * @throws \Exception
+	 * @return void
+	 */
+	protected function sendReport()
+	{
+		if ($this->hasReport()) {
+
+			// Prepare email.
+			$this->getMailMessage()->setTo($this->getTo())
+				->setFrom($this->getFrom())
+				->setSubject('Duplicate records detected!')
+				->setBody(implode("\n", $this->message));
+
+			$isSent = $this->getMailMessage()->send();
+
+			if (!$isSent) {
+				throw new \Exception('I could not send a message', 1408343882);
+			}
+
+			$to = $this->getTo();
+			$this->outputLine();
+			$message = sprintf('Report was sent to %s', key($to));
+			$this->outputLine($message);
+		}
+	}
+
+	/**
+	 * Send a report
+	 *
+	 * @return bool
+	 */
+	protected function hasReport()
+	{
+		return !empty($this->duplicateRecords);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getTo()
+	{
+
+		$to = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$to[$emailAddress] = $name;
+
+		}
+		return $to;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getFrom()
+	{
+
+		$from = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$from[$emailAddress] = $name;
+		}
+		return $from;
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\Mail\MailMessage|object
+	 */
+	public function getMailMessage()
+	{
+		if (is_null($this->mailMessage)) {
+			$this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
+		}
+		return $this->mailMessage;
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
 
 }

Classes/Command/ThumbnailCommandController.php

Indentation +133 added lines, -133 removed lines

@@ -21,137 +21,137 @@
 class ThumbnailCommandController extends CommandController
 {
 
-    /**
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
-     */
-    protected function initializeCommandMethodArguments()
-    {
-        parent::initializeCommandMethodArguments();
-        if ($this->arguments->hasArgument('configuration')) {
-            $propertyMappingConfiguration = $this->arguments->getArgument('configuration')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter(
-                $this->objectManager->get(ConfigurationArrayConverter::class)
-            );
-        }
-    }
-
-
-    /**
-     * Generate a bunch of thumbnails in advance to speed up the output of the Media BE module.
-     *
-     * @param int $limit where to stop in the batch processing.
-     * @param int $offset where to start in the batch processing.
-     * @param array $configuration override the default thumbnail configuration.
-     * @param bool $verbose will output a detail result of the thumbnail generation.
-     * @return void
-     */
-    public function generateCommand($limit = 0, $offset = 0, $configuration = [], $verbose = false)
-    {
-
-        $this->checkEnvironment();
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // TODO: Make me more flexible by passing thumbnail configuration. For now it will only generate thumbnails for the BE module.
-
-            $this->outputLine();
-            $this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-            $this->outputLine('--------------------------------------------');
-            $this->outputLine();
-
-            if ($storage->isOnline()) {
-
-                // For the CLI cause.
-                $storage->setEvaluatePermissions(false);
-
-                $thumbnailGenerator = $this->getThumbnailGenerator();
-                $thumbnailGenerator
-                    ->setStorage($storage)
-                    ->setConfiguration($configuration)
-                    ->generate($limit, $offset);
-
-                if ($verbose) {
-                    $resultSet = $thumbnailGenerator->getResultSet();
-                    foreach ($resultSet as $result) {
-                        $message = sprintf('* File "%s": %s %s',
-                            $result['fileUid'],
-                            $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
-                        );
-                        $this->outputLine($message);
-                    }
-                    $this->outputLine();
-                }
-
-                $message = sprintf('Done! New generated %s thumbnail(s) from %s traversed file(s) of a total of %s files.',
-                    $thumbnailGenerator->getNumberOfProcessedFiles(),
-                    $thumbnailGenerator->getNumberOfTraversedFiles(),
-                    $thumbnailGenerator->getTotalNumberOfFiles()
-                );
-                $this->outputLine($message);
-
-                // Add warning message if missing files were found along the way.
-                if ($thumbnailGenerator->getNumberOfMissingFiles() > 0) {
-
-                    $message = sprintf('ATTENTION! %s missing file(s) detected.',
-                        $thumbnailGenerator->getNumberOfMissingFiles()
-                    );
-                    $this->outputLine($message);
-                }
-            } else {
-                $this->outputLine('Storage is offline!');
-            }
-        }
-    }
-
-    /**
-     * @return void
-     */
-    protected function checkEnvironment()
-    {
-        $user = $this->getDataService()->getRecord(
-            'be_users', [
-            'username' => '_cli_lowlevel'
-        ]);
-
-        if (empty($user)) {
-            $this->outputLine('Missing User "_cli_lowlevel" and / or its password.');
-            $this->sendAndExit(1);
-        }
-
-        $user = $this->getDataService()->getRecord(
-            'be_users', [
-            'username' => '_cli_scheduler'
-        ]);
-
-        if (empty($user)) {
-            $this->outputLine('Missing User "_cli_scheduler" and / or its password.');
-            $this->sendAndExit(1);
-        }
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
-     */
-    protected function getThumbnailGenerator()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
+	/**
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentTypeException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
+	 */
+	protected function initializeCommandMethodArguments()
+	{
+		parent::initializeCommandMethodArguments();
+		if ($this->arguments->hasArgument('configuration')) {
+			$propertyMappingConfiguration = $this->arguments->getArgument('configuration')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter(
+				$this->objectManager->get(ConfigurationArrayConverter::class)
+			);
+		}
+	}
+
+
+	/**
+	 * Generate a bunch of thumbnails in advance to speed up the output of the Media BE module.
+	 *
+	 * @param int $limit where to stop in the batch processing.
+	 * @param int $offset where to start in the batch processing.
+	 * @param array $configuration override the default thumbnail configuration.
+	 * @param bool $verbose will output a detail result of the thumbnail generation.
+	 * @return void
+	 */
+	public function generateCommand($limit = 0, $offset = 0, $configuration = [], $verbose = false)
+	{
+
+		$this->checkEnvironment();
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// TODO: Make me more flexible by passing thumbnail configuration. For now it will only generate thumbnails for the BE module.
+
+			$this->outputLine();
+			$this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+			$this->outputLine('--------------------------------------------');
+			$this->outputLine();
+
+			if ($storage->isOnline()) {
+
+				// For the CLI cause.
+				$storage->setEvaluatePermissions(false);
+
+				$thumbnailGenerator = $this->getThumbnailGenerator();
+				$thumbnailGenerator
+					->setStorage($storage)
+					->setConfiguration($configuration)
+					->generate($limit, $offset);
+
+				if ($verbose) {
+					$resultSet = $thumbnailGenerator->getResultSet();
+					foreach ($resultSet as $result) {
+						$message = sprintf('* File "%s": %s %s',
+							$result['fileUid'],
+							$result['fileIdentifier'],
+							empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+						);
+						$this->outputLine($message);
+					}
+					$this->outputLine();
+				}
+
+				$message = sprintf('Done! New generated %s thumbnail(s) from %s traversed file(s) of a total of %s files.',
+					$thumbnailGenerator->getNumberOfProcessedFiles(),
+					$thumbnailGenerator->getNumberOfTraversedFiles(),
+					$thumbnailGenerator->getTotalNumberOfFiles()
+				);
+				$this->outputLine($message);
+
+				// Add warning message if missing files were found along the way.
+				if ($thumbnailGenerator->getNumberOfMissingFiles() > 0) {
+
+					$message = sprintf('ATTENTION! %s missing file(s) detected.',
+						$thumbnailGenerator->getNumberOfMissingFiles()
+					);
+					$this->outputLine($message);
+				}
+			} else {
+				$this->outputLine('Storage is offline!');
+			}
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function checkEnvironment()
+	{
+		$user = $this->getDataService()->getRecord(
+			'be_users', [
+			'username' => '_cli_lowlevel'
+		]);
+
+		if (empty($user)) {
+			$this->outputLine('Missing User "_cli_lowlevel" and / or its password.');
+			$this->sendAndExit(1);
+		}
+
+		$user = $this->getDataService()->getRecord(
+			'be_users', [
+			'username' => '_cli_scheduler'
+		]);
+
+		if (empty($user)) {
+			$this->outputLine('Missing User "_cli_scheduler" and / or its password.');
+			$this->sendAndExit(1);
+		}
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
+	 */
+	protected function getThumbnailGenerator()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
 }

Classes/Grid/UsageRenderer.php

Indentation +209 added lines, -209 removed lines

@@ -22,213 +22,213 @@
 class UsageRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Render usage of an asset in the grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $file = $this->getFileConverter()->convert($this->object);
-
-        $result = '';
-
-        // Add number of references on the top!
-        if ($this->object['number_of_references'] > 1) {
-            $result .= sprintf(
-                '<div><strong>%s (%s)</strong></div>',
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:references'),
-                $this->object['number_of_references']
-            );
-        }
-
-        // Render File usage
-        $fileReferences = $this->getFileReferenceService()->findFileReferences($file);
-        if (!empty($fileReferences)) {
-
-            // Finalize file references assembling.
-            $result .= sprintf(
-                $this->getWrappingTemplate(),
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:file_reference'),
-                $this->assembleOutput($fileReferences, array('referenceIdentifier' => 'uid_foreign', 'tableName' => 'tablenames'))
-            );
-        }
-
-        // Render link usage in RTE
-        $linkSoftReferences = $this->getFileReferenceService()->findSoftLinkReferences($file);
-        if (!empty($linkSoftReferences)) {
-
-            // Finalize link references assembling.
-            $result .= sprintf(
-                $this->getWrappingTemplate(),
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:link_references_in_rte'),
-                $this->assembleOutput($linkSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
-            );
-        }
-
-        // Render image usage in RTE
-        $imageSoftReferences = $this->getFileReferenceService()->findSoftImageReferences($file);
-        if (!empty($imageSoftReferences)) {
-
-            // Finalize image references assembling.
-            $result .= sprintf(
-                $this->getWrappingTemplate(),
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:image_references_in_rte'),
-                $this->assembleOutput($imageSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Assemble output reference.
-     *
-     * @param array $references
-     * @param array $mapping
-     * @return string
-     */
-    protected function assembleOutput(array $references, array $mapping)
-    {
-
-        $result = '';
-        foreach ($references as $reference) {
-            $button = $this->makeLinkButton()
-                ->setHref($this->getEditUri($reference, $mapping))
-                ->setClasses('btn-edit-reference')
-                ->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
-                ->render();
-
-            $tableName = $reference[$mapping['tableName']];
-            $identifier = (int)$reference[$mapping['referenceIdentifier']];
-
-            $result .= sprintf(
-                '<li title="">%s %s</li>',
-                $button,
-                $this->computeTitle($tableName, $identifier)
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param string $tableName
-     * @param int $identifier
-     * @return string
-     */
-    protected function computeTitle($tableName, $identifier)
-    {
-        $title = '';
-        if (!empty($GLOBALS['TCA'][$tableName])) {
-            $title = $this->getRecordTitle($tableName, $identifier);
-            if (!$title) {
-                $title = Tca::table($tableName)->getTitle();
-            }
-        }
-        return $title;
-    }
-
-    /**
-     * @return object|LinkButton
-     */
-    protected function makeLinkButton()
-    {
-        return GeneralUtility::makeInstance(LinkButton::class);
-    }
-
-    /**
-     * @param array $reference
-     * @param array $mapping
-     * @return string
-     */
-    protected function getEditUri(array $reference, array $mapping)
-    {
-
-        $parameterName = sprintf('edit[%s][%s]', $reference[$mapping['tableName']], $reference[$mapping['referenceIdentifier']]);
-        $uri = BackendUtility::getModuleUrl(
-            'record_edit',
-            array(
-                $parameterName => 'edit',
-                'returnUrl' => $this->getModuleUrl()
-            )
-        );
-        return $uri;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getModuleUrl()
-    {
-
-        $additionalParameters = [];
-        if (GeneralUtility::_GP('id')) {
-            $additionalParameters = array(
-                'id' => urldecode(GeneralUtility::_GP('id')),
-            );
-        }
-        return BackendUtility::getModuleUrl(GeneralUtility::_GP('route'), $additionalParameters);
-    }
-
-    /**
-     * Return the title given a table name and an identifier.
-     *
-     * @param string $tableName
-     * @param string $identifier
-     * @return string
-     */
-    protected function getRecordTitle($tableName, $identifier)
-    {
-
-        $result = '';
-        if ($tableName && (int)$identifier > 0) {
-
-            $labelField = Tca::table($tableName)->getLabelField();
-
-            // Get the title of the record.
-            $record = $this->getDataService()
-                ->getRecord($tableName, ['uid' => $identifier,]);
-
-            if (!empty($record[$labelField])) {
-                $result = $record[$labelField];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * Return the wrapping HTML template.
-     *
-     * @return string
-     */
-    protected function getWrappingTemplate()
-    {
-        return '<div style="text-decoration: underline; margin-top: 10px; margin-bottom: 10px">%s</div><ul class="usage-list">%s</ul>';
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
-
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * Render usage of an asset in the grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$file = $this->getFileConverter()->convert($this->object);
+
+		$result = '';
+
+		// Add number of references on the top!
+		if ($this->object['number_of_references'] > 1) {
+			$result .= sprintf(
+				'<div><strong>%s (%s)</strong></div>',
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:references'),
+				$this->object['number_of_references']
+			);
+		}
+
+		// Render File usage
+		$fileReferences = $this->getFileReferenceService()->findFileReferences($file);
+		if (!empty($fileReferences)) {
+
+			// Finalize file references assembling.
+			$result .= sprintf(
+				$this->getWrappingTemplate(),
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:file_reference'),
+				$this->assembleOutput($fileReferences, array('referenceIdentifier' => 'uid_foreign', 'tableName' => 'tablenames'))
+			);
+		}
+
+		// Render link usage in RTE
+		$linkSoftReferences = $this->getFileReferenceService()->findSoftLinkReferences($file);
+		if (!empty($linkSoftReferences)) {
+
+			// Finalize link references assembling.
+			$result .= sprintf(
+				$this->getWrappingTemplate(),
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:link_references_in_rte'),
+				$this->assembleOutput($linkSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
+			);
+		}
+
+		// Render image usage in RTE
+		$imageSoftReferences = $this->getFileReferenceService()->findSoftImageReferences($file);
+		if (!empty($imageSoftReferences)) {
+
+			// Finalize image references assembling.
+			$result .= sprintf(
+				$this->getWrappingTemplate(),
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:image_references_in_rte'),
+				$this->assembleOutput($imageSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Assemble output reference.
+	 *
+	 * @param array $references
+	 * @param array $mapping
+	 * @return string
+	 */
+	protected function assembleOutput(array $references, array $mapping)
+	{
+
+		$result = '';
+		foreach ($references as $reference) {
+			$button = $this->makeLinkButton()
+				->setHref($this->getEditUri($reference, $mapping))
+				->setClasses('btn-edit-reference')
+				->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
+				->render();
+
+			$tableName = $reference[$mapping['tableName']];
+			$identifier = (int)$reference[$mapping['referenceIdentifier']];
+
+			$result .= sprintf(
+				'<li title="">%s %s</li>',
+				$button,
+				$this->computeTitle($tableName, $identifier)
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @param int $identifier
+	 * @return string
+	 */
+	protected function computeTitle($tableName, $identifier)
+	{
+		$title = '';
+		if (!empty($GLOBALS['TCA'][$tableName])) {
+			$title = $this->getRecordTitle($tableName, $identifier);
+			if (!$title) {
+				$title = Tca::table($tableName)->getTitle();
+			}
+		}
+		return $title;
+	}
+
+	/**
+	 * @return object|LinkButton
+	 */
+	protected function makeLinkButton()
+	{
+		return GeneralUtility::makeInstance(LinkButton::class);
+	}
+
+	/**
+	 * @param array $reference
+	 * @param array $mapping
+	 * @return string
+	 */
+	protected function getEditUri(array $reference, array $mapping)
+	{
+
+		$parameterName = sprintf('edit[%s][%s]', $reference[$mapping['tableName']], $reference[$mapping['referenceIdentifier']]);
+		$uri = BackendUtility::getModuleUrl(
+			'record_edit',
+			array(
+				$parameterName => 'edit',
+				'returnUrl' => $this->getModuleUrl()
+			)
+		);
+		return $uri;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getModuleUrl()
+	{
+
+		$additionalParameters = [];
+		if (GeneralUtility::_GP('id')) {
+			$additionalParameters = array(
+				'id' => urldecode(GeneralUtility::_GP('id')),
+			);
+		}
+		return BackendUtility::getModuleUrl(GeneralUtility::_GP('route'), $additionalParameters);
+	}
+
+	/**
+	 * Return the title given a table name and an identifier.
+	 *
+	 * @param string $tableName
+	 * @param string $identifier
+	 * @return string
+	 */
+	protected function getRecordTitle($tableName, $identifier)
+	{
+
+		$result = '';
+		if ($tableName && (int)$identifier > 0) {
+
+			$labelField = Tca::table($tableName)->getLabelField();
+
+			// Get the title of the record.
+			$record = $this->getDataService()
+				->getRecord($tableName, ['uid' => $identifier,]);
+
+			if (!empty($record[$labelField])) {
+				$result = $record[$labelField];
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * Return the wrapping HTML template.
+	 *
+	 * @return string
+	 */
+	protected function getWrappingTemplate()
+	{
+		return '<div style="text-decoration: underline; margin-top: 10px; margin-bottom: 10px">%s</div><ul class="usage-list">%s</ul>';
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
+
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 }