fabarea / media

Classes/Domain/Validator/StorageValidator.php

Indentation +25 added lines, -25 removed lines

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

Classes/Grid/MetadataRenderer.php

Indentation +64 added lines, -64 removed lines

@@ -19,78 +19,78 @@
 class MetadataRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Renders a configurable metadata property of a file in the Grid.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Renders a configurable metadata property of a file in the Grid.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
 
-        if (empty($this->gridRendererConfiguration['property'])) {
-            throw new \Exception('Missing property value for Grid Renderer Metadata', 1390391042);
-        }
+		if (empty($this->gridRendererConfiguration['property'])) {
+			throw new \Exception('Missing property value for Grid Renderer Metadata', 1390391042);
+		}
 
-        $file = $this->getFileConverter()->convert($this->object);
-        $propertyName = $this->gridRendererConfiguration['property'];
+		$file = $this->getFileConverter()->convert($this->object);
+		$propertyName = $this->gridRendererConfiguration['property'];
 
-        if ($propertyName === 'uid') {
-            $metadata = $file->_getMetaData();
-            $result = $metadata['uid']; // make an exception here to retrieve the uid of the metadata.
-        } else {
-            $result = $file->getProperty($propertyName);
-        }
+		if ($propertyName === 'uid') {
+			$metadata = $file->_getMetaData();
+			$result = $metadata['uid']; // make an exception here to retrieve the uid of the metadata.
+		} else {
+			$result = $file->getProperty($propertyName);
+		}
 
-        // Avoid bad surprise, converts characters to HTML.
-        $fieldType = Tca::table('sys_file_metadata')->field($propertyName)->getType();
-        if ($fieldType !== FieldType::TEXTAREA) {
-            $result = htmlentities($result);
-        } elseif ($fieldType === FieldType::TEXTAREA && !$this->isClean($result)) {
-            $result = htmlentities($result);
-        } elseif ($fieldType === FieldType::TEXTAREA && !$this->hasHtml($result)) {
-            $result = nl2br($result);
-        }
+		// Avoid bad surprise, converts characters to HTML.
+		$fieldType = Tca::table('sys_file_metadata')->field($propertyName)->getType();
+		if ($fieldType !== FieldType::TEXTAREA) {
+			$result = htmlentities($result);
+		} elseif ($fieldType === FieldType::TEXTAREA && !$this->isClean($result)) {
+			$result = htmlentities($result);
+		} elseif ($fieldType === FieldType::TEXTAREA && !$this->hasHtml($result)) {
+			$result = nl2br($result);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Check whether a string contains HTML tags.
-     *
-     * @param string $content the content to be analyzed
-     * @return boolean
-     */
-    protected function hasHtml($content)
-    {
-        $result = false;
+	/**
+	 * Check whether a string contains HTML tags.
+	 *
+	 * @param string $content the content to be analyzed
+	 * @return boolean
+	 */
+	protected function hasHtml($content)
+	{
+		$result = false;
 
-        // We compare the length of the string with html tags and without html tags.
-        if (strlen($content) != strlen(strip_tags($content))) {
-            $result = true;
-        }
-        return $result;
-    }
+		// We compare the length of the string with html tags and without html tags.
+		if (strlen($content) != strlen(strip_tags($content))) {
+			$result = true;
+		}
+		return $result;
+	}
 
-    /**
-     * Check whether a string contains potential XSS
-     *
-     * @param string $content the content to be analyzed
-     * @return boolean
-     */
-    protected function isClean($content)
-    {
+	/**
+	 * Check whether a string contains potential XSS
+	 *
+	 * @param string $content the content to be analyzed
+	 * @return boolean
+	 */
+	protected function isClean($content)
+	{
 
-        // @todo implement me!
-        $result = true;
-        return $result;
-    }
+		// @todo implement me!
+		$result = true;
+		return $result;
+	}
 
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 }

Classes/Grid/PreviewRenderer.php

Indentation +68 added lines, -68 removed lines

@@ -21,82 +21,82 @@
 class PreviewRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Render a preview of a file in the Grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Render a preview of a file in the Grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
 
-        $file = $this->getFileConverter()->convert($this->object);
+		$file = $this->getFileConverter()->convert($this->object);
 
-        $uri = false;
-        $appendTime = true;
+		$uri = false;
+		$appendTime = true;
 
-        // Compute image-editor or link-creator URL.
-        if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
-            $appendTime = false;
-            $uri = $this->getPluginUri('ImageEditor');
-        } elseif ($this->getModuleLoader()->hasPlugin('linkCreator')) {
-            $appendTime = false;
-            $uri = $this->getPluginUri('LinkCreator');
-        }
+		// Compute image-editor or link-creator URL.
+		if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
+			$appendTime = false;
+			$uri = $this->getPluginUri('ImageEditor');
+		} elseif ($this->getModuleLoader()->hasPlugin('linkCreator')) {
+			$appendTime = false;
+			$uri = $this->getPluginUri('LinkCreator');
+		}
 
-        $result = $this->getThumbnailService($file)
-            ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
-            ->setAppendTimeStamp($appendTime)
-            ->setTarget(ThumbnailInterface::TARGET_BLANK)
-            ->setAnchorUri($uri)
-            ->setAttributes([])
-            ->create();
+		$result = $this->getThumbnailService($file)
+			->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
+			->setAppendTimeStamp($appendTime)
+			->setTarget(ThumbnailInterface::TARGET_BLANK)
+			->setAnchorUri($uri)
+			->setAttributes([])
+			->create();
 
-        // Add file info
-        $result .= sprintf('<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
-            $this->getMetadataViewHelper()->render($file)
-        );
-        return $result;
-    }
+		// Add file info
+		$result .= sprintf('<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
+			$this->getMetadataViewHelper()->render($file)
+		);
+		return $result;
+	}
 
-    /**
-     * @param File $file
-     * @return \Fab\Media\Thumbnail\ThumbnailService|object
-     */
-    protected function getThumbnailService(File $file)
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailService::class, $file);
-    }
+	/**
+	 * @param File $file
+	 * @return \Fab\Media\Thumbnail\ThumbnailService|object
+	 */
+	protected function getThumbnailService(File $file)
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailService::class, $file);
+	}
 
-    /**
-     * @return \Fab\Media\ViewHelpers\MetadataViewHelper|object
-     */
-    protected function getMetadataViewHelper()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\ViewHelpers\MetadataViewHelper::class);
-    }
+	/**
+	 * @return \Fab\Media\ViewHelpers\MetadataViewHelper|object
+	 */
+	protected function getMetadataViewHelper()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\ViewHelpers\MetadataViewHelper::class);
+	}
 
-    /**
-     * @param string $controllerName
-     * @return string
-     */
-    protected function getPluginUri($controllerName)
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => $controllerName,
-                'action' => 'show',
-                'file' => $this->object->getUid(),
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @param string $controllerName
+	 * @return string
+	 */
+	protected function getPluginUri($controllerName)
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => $controllerName,
+				'action' => 'show',
+				'file' => $this->object->getUid(),
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 
 }

Classes/Hook/FileUploadHook.php

Indentation +33 added lines, -33 removed lines

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

Classes/Hook/DataHandlerHook.php

Indentation +306 added lines, -306 removed lines

@@ -23,311 +23,311 @@
 class DataHandlerHook
 {
 
-    /**
-     * Store indexed file before the Data Handler start "working".
-     *
-     * @var array
-     */
-    protected $beforeDataHandlerProcessFileIdentifiers = [];
-
-    /**
-     * Store indexed file after the Data Handler has done its job.
-     *
-     * @var array
-     */
-    protected $afterDataHandlerProcessFileIdentifiers = [];
-
-    /**
-     * Internal key for the Cache Manager.
-     *
-     * @var string
-     */
-    protected $registerKey = 'media-hook-elementsToKeepTrack';
-
-    /**
-     * First procedures to launch before all operations in DataHandler.
-     *
-     * Feed variable $this->beforeDataHandlerProcessFileIdentifiers
-     *
-     * @param \TYPO3\CMS\Core\DataHandling\DataHandler $caller TCEMain Object
-     * @return void
-     */
-    public function processDatamap_beforeStart(DataHandler $caller)
-    {
-
-        // Use a register to keep track of files.
-        // It is required according to TCEMain behaviour which register "elements to be deleted".
-        // Those element must not be forgotten.
-        $this->initializeFileRegister();
-        $this->registerFilesToKeepTrack();
-
-        foreach ($caller->datamap as $tableName => $configuration) {
-
-            $id = key($configuration);
-            if (!MathUtility::canBeInterpretedAsInteger($id)) {
-                continue;
-            }
-
-            /** @var $refIndexObj \TYPO3\CMS\Core\Database\ReferenceIndex */
-            $refIndexObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
-            if (\TYPO3\CMS\Backend\Utility\BackendUtility::isTableWorkspaceEnabled($tableName)) {
-                $refIndexObj->setWorkspaceId($caller->BE_USER->workspace);
-            }
-            $indexes = $refIndexObj->updateRefIndexTable($tableName, $id);
-
-            // Make sure $index is an array.
-            if (!is_array($indexes)) {
-                $indexes = [];
-            }
-
-            $fileIdentifiers = $this->lookForFiles($indexes);
-            $this->addBeforeDataHandlerProcessFileIdentifiers($fileIdentifiers);
-        }
-    }
-
-    /**
-     * Last procedures to launch after all operations in DataHandler.
-     *
-     * Process field "number_of_references" which may require updates.
-     *
-     * @param \TYPO3\CMS\Core\DataHandling\DataHandler $caller TCEMain Object
-     * @return void
-     */
-    public function processDatamap_afterAllOperations(DataHandler $caller)
-    {
-
-        // First collect files which have been involved.
-        foreach ($caller->datamap as $tableName => $configuration) {
-
-            $id = key($configuration);
-
-            /** @var $refIndexObj \TYPO3\CMS\Core\Database\ReferenceIndex */
-            $refIndexObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
-            if (\TYPO3\CMS\Backend\Utility\BackendUtility::isTableWorkspaceEnabled($tableName)) {
-                $refIndexObj->setWorkspaceId($caller->BE_USER->workspace);
-            }
-            $indexes = $refIndexObj->updateRefIndexTable($tableName, $id);
-
-            // Make sure $index is an array.
-            if (!is_array($indexes)) {
-                $indexes = [];
-            }
-
-            $fileIdentifiers = $this->lookForFiles($indexes);
-            $this->addAfterDataHandlerProcessFileIdentifiers($fileIdentifiers);
-        }
-
-        // After collecting files, update the column "number_of_references".
-        foreach ($this->getFileToProcess() as $fileIdentifier) {
-            try {
-                $file = ResourceFactory::getInstance()->getFileObject($fileIdentifier);
-                $numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
-
-                $values = array(
-                    'number_of_references' => $numberOfReferences
-                );
-                $this->getDataService()->update('sys_file', $values, ['uid' => $file->getUid()]);
-            } catch (FileDoesNotExistException $fileDoesNotExistException) {
-                // Do nothing here. A file that does not exist needs no update.
-                // See https://github.com/fabarea/media/issues/159 for more information.
-            }
-        }
-    }
-
-    /**
-     * @return void
-     */
-    protected function initializeFileRegister()
-    {
-
-        $items = $this->getMemoryCache()->get($this->registerKey);
-        if (!is_array($items)) {
-            $this->getMemoryCache()->set($this->registerKey, []);
-        }
-    }
-
-    /**
-     * @return void
-     */
-    protected function registerFilesToKeepTrack()
-    {
-        $fileIdentifiers = [];
-        $elementsToBeDeleted = $this->getMemoryCache()->get('core-t3lib_TCEmain-elementsToBeDeleted');
-        if (is_array($elementsToBeDeleted)) {
-            foreach ($elementsToBeDeleted as $tableName => $element) {
-
-                if ($tableName === 'sys_file_reference') {
-
-                    $fileReferenceIdentifier = key($element);
-                    if ($element[$fileReferenceIdentifier] === true) {
-                        $fileIdentifier = $this->findFileByFileReference($fileReferenceIdentifier);
-                        $fileIdentifiers[] = $fileIdentifier;
-                    }
-                }
-            }
-        }
-
-        // Put back in the memory cache the value.
-        $items = $this->getMemoryCache()->get($this->registerKey);
-        $mergedItems = array_merge($items, $fileIdentifiers);
-        $this->getMemoryCache()->set($this->registerKey, $mergedItems);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getRegisteredFiles()
-    {
-        $files = $this->getMemoryCache()->get($this->registerKey);
-        return $files;
-    }
-
-    /**
-     * Look for file which are within the reference index.
-     *
-     * @return array
-     */
-    protected function getFileToProcess()
-    {
-        $fileIdentifiers = array_merge(
-            $this->beforeDataHandlerProcessFileIdentifiers,
-            $this->afterDataHandlerProcessFileIdentifiers,
-            $this->getRegisteredFiles()
-        );
-        return array_unique($fileIdentifiers);
-    }
-
-    /**
-     * @param array $fileIdentifiers
-     * @return void
-     */
-    protected function addBeforeDataHandlerProcessFileIdentifiers(array $fileIdentifiers)
-    {
-        $this->beforeDataHandlerProcessFileIdentifiers = array_merge($this->beforeDataHandlerProcessFileIdentifiers, $fileIdentifiers);
-    }
-
-    /**
-     * @param array $fileIdentifiers
-     * @return void
-     */
-    protected function addAfterDataHandlerProcessFileIdentifiers(array $fileIdentifiers)
-    {
-        $this->afterDataHandlerProcessFileIdentifiers = array_merge($this->afterDataHandlerProcessFileIdentifiers, $fileIdentifiers);
-    }
-
-    /**
-     * Look for file which are within the reference index.
-     *
-     * @param array $indexes
-     * @return array
-     */
-    protected function lookForFiles(array $indexes)
-    {
-
-        $fileIdentifiers = [];
-        if (isset($indexes['relations'])) {
-
-            foreach ($indexes['relations'] as $index) {
-                if (is_array($index)) {
-                    if ($this->isSoftReferenceImage($index)) {
-                        $fileIdentifiers[] = $index['ref_uid'];
-                    } elseif ($this->isSoftReferenceLink($index)) {
-                        $fileIdentifiers[] = $index['ref_uid'];
-                    } elseif ($this->isFileReference($index)) {
-                        $fileIdentifiers[] = $this->findFileByFileReference($index['ref_uid']);
-                    }
-                }
-            }
-        }
-
-        return $fileIdentifiers;
-    }
-
-    /**
-     * @param array $index
-     * @return bool
-     */
-    public function isFileReference(array $index)
-    {
-        return $index['ref_table'] === 'sys_file_reference';
-    }
-
-    /**
-     * @param array $index
-     * @return bool
-     */
-    public function isSoftReferenceLink(array $index)
-    {
-        return $index['softref_key'] === 'typolink_tag' && $index['ref_table'] === 'sys_file';
-    }
-
-    /**
-     * @param array $index
-     * @return bool
-     */
-    public function isSoftReferenceImage(array $index)
-    {
-        return $index['softref_key'] === 'rtehtmlarea_images' && $index['ref_table'] === 'sys_file';
-    }
-
-    /**
-     * Retrieve the File identifier.
-     *
-     * @param $fileReferenceIdentifier
-     * @return int
-     * @throws \Exception
-     */
-    protected function findFileByFileReference($fileReferenceIdentifier)
-    {
-        $record = $this->getDataService()->getRecord(
-            'sys_file_reference',
-            [
-                'uid' => $fileReferenceIdentifier
-            ]
-        );
-
-        if (empty($record)) {
-            throw new \Exception('There is something broken with the File References. Consider updating the Reference Index.', 1408619796);
-        }
-
-        $fileIdentifier = $record['uid_local'];
-        return $fileIdentifier;
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
-
-    /**
-     * Gets an instance of the memory cache.
-     *
-     * @return \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend
-     */
-    protected function getMemoryCache()
-    {
-        return $this->getCacheManager()->getCache('cache_runtime');
-    }
-
-    /**
-     * Create and returns an instance of the CacheManager
-     *
-     * @return \TYPO3\CMS\Core\Cache\CacheManager|object
-     */
-    protected function getCacheManager()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * Store indexed file before the Data Handler start "working".
+	 *
+	 * @var array
+	 */
+	protected $beforeDataHandlerProcessFileIdentifiers = [];
+
+	/**
+	 * Store indexed file after the Data Handler has done its job.
+	 *
+	 * @var array
+	 */
+	protected $afterDataHandlerProcessFileIdentifiers = [];
+
+	/**
+	 * Internal key for the Cache Manager.
+	 *
+	 * @var string
+	 */
+	protected $registerKey = 'media-hook-elementsToKeepTrack';
+
+	/**
+	 * First procedures to launch before all operations in DataHandler.
+	 *
+	 * Feed variable $this->beforeDataHandlerProcessFileIdentifiers
+	 *
+	 * @param \TYPO3\CMS\Core\DataHandling\DataHandler $caller TCEMain Object
+	 * @return void
+	 */
+	public function processDatamap_beforeStart(DataHandler $caller)
+	{
+
+		// Use a register to keep track of files.
+		// It is required according to TCEMain behaviour which register "elements to be deleted".
+		// Those element must not be forgotten.
+		$this->initializeFileRegister();
+		$this->registerFilesToKeepTrack();
+
+		foreach ($caller->datamap as $tableName => $configuration) {
+
+			$id = key($configuration);
+			if (!MathUtility::canBeInterpretedAsInteger($id)) {
+				continue;
+			}
+
+			/** @var $refIndexObj \TYPO3\CMS\Core\Database\ReferenceIndex */
+			$refIndexObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
+			if (\TYPO3\CMS\Backend\Utility\BackendUtility::isTableWorkspaceEnabled($tableName)) {
+				$refIndexObj->setWorkspaceId($caller->BE_USER->workspace);
+			}
+			$indexes = $refIndexObj->updateRefIndexTable($tableName, $id);
+
+			// Make sure $index is an array.
+			if (!is_array($indexes)) {
+				$indexes = [];
+			}
+
+			$fileIdentifiers = $this->lookForFiles($indexes);
+			$this->addBeforeDataHandlerProcessFileIdentifiers($fileIdentifiers);
+		}
+	}
+
+	/**
+	 * Last procedures to launch after all operations in DataHandler.
+	 *
+	 * Process field "number_of_references" which may require updates.
+	 *
+	 * @param \TYPO3\CMS\Core\DataHandling\DataHandler $caller TCEMain Object
+	 * @return void
+	 */
+	public function processDatamap_afterAllOperations(DataHandler $caller)
+	{
+
+		// First collect files which have been involved.
+		foreach ($caller->datamap as $tableName => $configuration) {
+
+			$id = key($configuration);
+
+			/** @var $refIndexObj \TYPO3\CMS\Core\Database\ReferenceIndex */
+			$refIndexObj = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
+			if (\TYPO3\CMS\Backend\Utility\BackendUtility::isTableWorkspaceEnabled($tableName)) {
+				$refIndexObj->setWorkspaceId($caller->BE_USER->workspace);
+			}
+			$indexes = $refIndexObj->updateRefIndexTable($tableName, $id);
+
+			// Make sure $index is an array.
+			if (!is_array($indexes)) {
+				$indexes = [];
+			}
+
+			$fileIdentifiers = $this->lookForFiles($indexes);
+			$this->addAfterDataHandlerProcessFileIdentifiers($fileIdentifiers);
+		}
+
+		// After collecting files, update the column "number_of_references".
+		foreach ($this->getFileToProcess() as $fileIdentifier) {
+			try {
+				$file = ResourceFactory::getInstance()->getFileObject($fileIdentifier);
+				$numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
+
+				$values = array(
+					'number_of_references' => $numberOfReferences
+				);
+				$this->getDataService()->update('sys_file', $values, ['uid' => $file->getUid()]);
+			} catch (FileDoesNotExistException $fileDoesNotExistException) {
+				// Do nothing here. A file that does not exist needs no update.
+				// See https://github.com/fabarea/media/issues/159 for more information.
+			}
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function initializeFileRegister()
+	{
+
+		$items = $this->getMemoryCache()->get($this->registerKey);
+		if (!is_array($items)) {
+			$this->getMemoryCache()->set($this->registerKey, []);
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function registerFilesToKeepTrack()
+	{
+		$fileIdentifiers = [];
+		$elementsToBeDeleted = $this->getMemoryCache()->get('core-t3lib_TCEmain-elementsToBeDeleted');
+		if (is_array($elementsToBeDeleted)) {
+			foreach ($elementsToBeDeleted as $tableName => $element) {
+
+				if ($tableName === 'sys_file_reference') {
+
+					$fileReferenceIdentifier = key($element);
+					if ($element[$fileReferenceIdentifier] === true) {
+						$fileIdentifier = $this->findFileByFileReference($fileReferenceIdentifier);
+						$fileIdentifiers[] = $fileIdentifier;
+					}
+				}
+			}
+		}
+
+		// Put back in the memory cache the value.
+		$items = $this->getMemoryCache()->get($this->registerKey);
+		$mergedItems = array_merge($items, $fileIdentifiers);
+		$this->getMemoryCache()->set($this->registerKey, $mergedItems);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getRegisteredFiles()
+	{
+		$files = $this->getMemoryCache()->get($this->registerKey);
+		return $files;
+	}
+
+	/**
+	 * Look for file which are within the reference index.
+	 *
+	 * @return array
+	 */
+	protected function getFileToProcess()
+	{
+		$fileIdentifiers = array_merge(
+			$this->beforeDataHandlerProcessFileIdentifiers,
+			$this->afterDataHandlerProcessFileIdentifiers,
+			$this->getRegisteredFiles()
+		);
+		return array_unique($fileIdentifiers);
+	}
+
+	/**
+	 * @param array $fileIdentifiers
+	 * @return void
+	 */
+	protected function addBeforeDataHandlerProcessFileIdentifiers(array $fileIdentifiers)
+	{
+		$this->beforeDataHandlerProcessFileIdentifiers = array_merge($this->beforeDataHandlerProcessFileIdentifiers, $fileIdentifiers);
+	}
+
+	/**
+	 * @param array $fileIdentifiers
+	 * @return void
+	 */
+	protected function addAfterDataHandlerProcessFileIdentifiers(array $fileIdentifiers)
+	{
+		$this->afterDataHandlerProcessFileIdentifiers = array_merge($this->afterDataHandlerProcessFileIdentifiers, $fileIdentifiers);
+	}
+
+	/**
+	 * Look for file which are within the reference index.
+	 *
+	 * @param array $indexes
+	 * @return array
+	 */
+	protected function lookForFiles(array $indexes)
+	{
+
+		$fileIdentifiers = [];
+		if (isset($indexes['relations'])) {
+
+			foreach ($indexes['relations'] as $index) {
+				if (is_array($index)) {
+					if ($this->isSoftReferenceImage($index)) {
+						$fileIdentifiers[] = $index['ref_uid'];
+					} elseif ($this->isSoftReferenceLink($index)) {
+						$fileIdentifiers[] = $index['ref_uid'];
+					} elseif ($this->isFileReference($index)) {
+						$fileIdentifiers[] = $this->findFileByFileReference($index['ref_uid']);
+					}
+				}
+			}
+		}
+
+		return $fileIdentifiers;
+	}
+
+	/**
+	 * @param array $index
+	 * @return bool
+	 */
+	public function isFileReference(array $index)
+	{
+		return $index['ref_table'] === 'sys_file_reference';
+	}
+
+	/**
+	 * @param array $index
+	 * @return bool
+	 */
+	public function isSoftReferenceLink(array $index)
+	{
+		return $index['softref_key'] === 'typolink_tag' && $index['ref_table'] === 'sys_file';
+	}
+
+	/**
+	 * @param array $index
+	 * @return bool
+	 */
+	public function isSoftReferenceImage(array $index)
+	{
+		return $index['softref_key'] === 'rtehtmlarea_images' && $index['ref_table'] === 'sys_file';
+	}
+
+	/**
+	 * Retrieve the File identifier.
+	 *
+	 * @param $fileReferenceIdentifier
+	 * @return int
+	 * @throws \Exception
+	 */
+	protected function findFileByFileReference($fileReferenceIdentifier)
+	{
+		$record = $this->getDataService()->getRecord(
+			'sys_file_reference',
+			[
+				'uid' => $fileReferenceIdentifier
+			]
+		);
+
+		if (empty($record)) {
+			throw new \Exception('There is something broken with the File References. Consider updating the Reference Index.', 1408619796);
+		}
+
+		$fileIdentifier = $record['uid_local'];
+		return $fileIdentifier;
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
+
+	/**
+	 * Gets an instance of the memory cache.
+	 *
+	 * @return \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend
+	 */
+	protected function getMemoryCache()
+	{
+		return $this->getCacheManager()->getCache('cache_runtime');
+	}
+
+	/**
+	 * Create and returns an instance of the CacheManager
+	 *
+	 * @return \TYPO3\CMS\Core\Cache\CacheManager|object
+	 */
+	protected function getCacheManager()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Cache\CacheManager::class);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::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

Spacing +3 added lines, -3 removed lines

@@ -228,7 +228,7 @@ 
         }
 
         // Retrieve the folder object.
-        $folder = ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
+        $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
@@ -285,7 +285,7 @@ 
 
         // Get a possible mount point coming from the storage record.
         $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $uploadedFile->getType()];
+        $mountPointIdentifier = $storageRecord['mount_point_file_type_'.$uploadedFile->getType()];
         if ($mountPointIdentifier > 0) {
 
             // We don't have a Mount Point repository in FAL, so query the database directly.
@@ -313,7 +313,7 @@ 
 
         // Retrieve storage record and a possible configured mount point.
         $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $file->getType()];
+        $mountPointIdentifier = $storageRecord['mount_point_file_type_'.$file->getType()];
 
         if ($mountPointIdentifier > 0) {
 

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);
+	}
 
 }