fabarea / media

Classes/Thumbnail/ThumbnailGenerator.php

Doc Comments +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
     }
 
     /**
-     * @return int
+     * @return boolean
      */
     protected function isNewProcessedFile()
     {

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/View/Warning/ConfigurationWarning.php

Indentation +324 added lines, -324 removed lines

@@ -21,139 +21,139 @@ 
 class ConfigurationWarning extends AbstractComponentView
 {
 
-    /**
-     * @var array
-     */
-    protected $notAllowedMountPoints = [];
-
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
-
-        $result = '';
-
-        // Check whether storage is configured or not.
-        if ($this->checkStorageNotConfigured()) {
-            $this->configureStorage();
-            $result .= $this->formatMessageForStorageConfigured();
-        }
-
-        // Check whether storage is online or not.
-        if ($this->checkStorageOffline()) {
-            $result .= $this->formatMessageForStorageOffline();
-        }
-
-        // Check all mount points of the storage are available
-        if (!$this->checkMountPoints()) {
-            $result .= $this->formatMessageForMountPoints();
-        }
-
-        // Check all mount points of the storage are available
-        if (!$this->hasBeenWarmedUp() && !$this->checkColumnNumberOfReferences()) {
-            if ($this->canBeInitializedSilently() < 2000) {
-                $numberOfFiles = $this->getCacheService()->warmUp();
-                $result .= $this->formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFiles);
-                touch($this->getWarmUpSemaphoreFile());
-            } else {
-                $result .= $this->formatMessageForUpdateRequiredColumnNumberOfReferences();
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return \Fab\Media\Cache\CacheService|object
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
-    }
-
-    /**
-     * @return boolean
-     */
-    protected function configureStorage()
-    {
-        $tableName = 'sys_file_storage';
-        $fields = array(
-            'maximum_dimension_original_image',
-            'extension_allowed_file_type_1',
-            'extension_allowed_file_type_2',
-            'extension_allowed_file_type_3',
-            'extension_allowed_file_type_4',
-            'extension_allowed_file_type_5',
-        );
-
-        $values = [];
-        foreach ($fields as $field) {
-            $values[$field] = Tca::table($tableName)->field($field)->getDefaultValue();
-        }
-
-        $storage = $this->getMediaModule()->getCurrentStorage();
-        $this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = ' . $storage->getUid(), $values);
-    }
-
-    /**
-     * @return bool
-     */
-    protected function hasBeenWarmedUp()
-    {
-        return is_file(($this->getWarmUpSemaphoreFile()));
-    }
-
-    /**
-     * @return string
-     */
-    protected function getWarmUpSemaphoreFile()
-    {
-        return PATH_site . 'typo3temp/.media_cache_warmed_up';
-    }
-
-    /**
-     * Check whether the storage is correctly configured.
-     *
-     * @return boolean
-     */
-    protected function checkStorageNotConfigured()
-    {
-        $currentStorage = $this->getMediaModule()->getCurrentStorage();
-        $storageRecord = $currentStorage->getStorageRecord();
-
-        // Take the storage fields and check whether some data was initialized.
-        $fields = array(
-            'extension_allowed_file_type_1',
-            'extension_allowed_file_type_2',
-            'extension_allowed_file_type_3',
-            'extension_allowed_file_type_4',
-            'extension_allowed_file_type_5',
-        );
-
-        $result = true;
-        foreach ($fields as $fieldName) {
-            // true means the storage has data and thus was configured / saved once.
-            if (!empty($storageRecord[$fieldName])) {
-                $result = false;
-                break;
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Format a message whenever the storage is offline.
-     *
-     * @return string
-     */
-    protected function formatMessageForStorageConfigured()
-    {
-        $storage = $this->getMediaModule()->getCurrentStorage();
-
-        $result = <<< EOF
+	/**
+	 * @var array
+	 */
+	protected $notAllowedMountPoints = [];
+
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+
+		$result = '';
+
+		// Check whether storage is configured or not.
+		if ($this->checkStorageNotConfigured()) {
+			$this->configureStorage();
+			$result .= $this->formatMessageForStorageConfigured();
+		}
+
+		// Check whether storage is online or not.
+		if ($this->checkStorageOffline()) {
+			$result .= $this->formatMessageForStorageOffline();
+		}
+
+		// Check all mount points of the storage are available
+		if (!$this->checkMountPoints()) {
+			$result .= $this->formatMessageForMountPoints();
+		}
+
+		// Check all mount points of the storage are available
+		if (!$this->hasBeenWarmedUp() && !$this->checkColumnNumberOfReferences()) {
+			if ($this->canBeInitializedSilently() < 2000) {
+				$numberOfFiles = $this->getCacheService()->warmUp();
+				$result .= $this->formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFiles);
+				touch($this->getWarmUpSemaphoreFile());
+			} else {
+				$result .= $this->formatMessageForUpdateRequiredColumnNumberOfReferences();
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return \Fab\Media\Cache\CacheService|object
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
+	}
+
+	/**
+	 * @return boolean
+	 */
+	protected function configureStorage()
+	{
+		$tableName = 'sys_file_storage';
+		$fields = array(
+			'maximum_dimension_original_image',
+			'extension_allowed_file_type_1',
+			'extension_allowed_file_type_2',
+			'extension_allowed_file_type_3',
+			'extension_allowed_file_type_4',
+			'extension_allowed_file_type_5',
+		);
+
+		$values = [];
+		foreach ($fields as $field) {
+			$values[$field] = Tca::table($tableName)->field($field)->getDefaultValue();
+		}
+
+		$storage = $this->getMediaModule()->getCurrentStorage();
+		$this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = ' . $storage->getUid(), $values);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function hasBeenWarmedUp()
+	{
+		return is_file(($this->getWarmUpSemaphoreFile()));
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getWarmUpSemaphoreFile()
+	{
+		return PATH_site . 'typo3temp/.media_cache_warmed_up';
+	}
+
+	/**
+	 * Check whether the storage is correctly configured.
+	 *
+	 * @return boolean
+	 */
+	protected function checkStorageNotConfigured()
+	{
+		$currentStorage = $this->getMediaModule()->getCurrentStorage();
+		$storageRecord = $currentStorage->getStorageRecord();
+
+		// Take the storage fields and check whether some data was initialized.
+		$fields = array(
+			'extension_allowed_file_type_1',
+			'extension_allowed_file_type_2',
+			'extension_allowed_file_type_3',
+			'extension_allowed_file_type_4',
+			'extension_allowed_file_type_5',
+		);
+
+		$result = true;
+		foreach ($fields as $fieldName) {
+			// true means the storage has data and thus was configured / saved once.
+			if (!empty($storageRecord[$fieldName])) {
+				$result = false;
+				break;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Format a message whenever the storage is offline.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForStorageConfigured()
+	{
+		$storage = $this->getMediaModule()->getCurrentStorage();
+
+		$result = <<< EOF
 			<div class="alert alert-info">
 				<div class="alert-title">
 						Storage has been configured.
@@ -166,29 +166,29 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * Check whether the storage is online or not.
-     *
-     * @return boolean
-     */
-    protected function checkStorageOffline()
-    {
-        return !$this->getMediaModule()->getCurrentStorage()->isOnline();
-    }
-
-    /**
-     * Format a message whenever the storage is offline.
-     *
-     * @return string
-     */
-    protected function formatMessageForStorageOffline()
-    {
-        $storage = $this->getMediaModule()->getCurrentStorage();
-
-        $result = <<< EOF
+		return $result;
+	}
+
+	/**
+	 * Check whether the storage is online or not.
+	 *
+	 * @return boolean
+	 */
+	protected function checkStorageOffline()
+	{
+		return !$this->getMediaModule()->getCurrentStorage()->isOnline();
+	}
+
+	/**
+	 * Format a message whenever the storage is offline.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForStorageOffline()
+	{
+		$storage = $this->getMediaModule()->getCurrentStorage();
+
+		$result = <<< EOF
 			<div class="alert alert-warning">
 					<div class="alert-title">
 						Storage is currently offline
@@ -200,85 +200,85 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * Check whether mount points privilege are ok.
-     *
-     * @return boolean
-     */
-    protected function checkMountPoints()
-    {
-        if (!$this->getBackendUser()->isAdmin()) {
-
-            $fileMounts = $this->getBackendUser()->getFileMountRecords();
-
-            $fileMountIdentifiers = [];
-            foreach ($fileMounts as $fileMount) {
-                $fileMountIdentifiers[] = $fileMount['uid'];
-            }
-
-            $storage = $this->getMediaModule()->getCurrentStorage();
-            $storageRecord = $storage->getStorageRecord();
-            $fieldNames = array(
-                'mount_point_file_type_1',
-                'mount_point_file_type_2',
-                'mount_point_file_type_3',
-                'mount_point_file_type_4',
-                'mount_point_file_type_5',
-            );
-            foreach ($fieldNames as $fileName) {
-                $fileMountIdentifier = (int)$storageRecord[$fileName];
-                if ($fileMountIdentifier > 0 && !in_array($fileMountIdentifier, $fileMountIdentifiers)) {
-                    $this->notAllowedMountPoints[] = $this->fetchMountPoint($fileMountIdentifier);
-                } else {
-                    # $fileMountIdentifier
-                    $folder = $storage->getRootLevelFolder();
-                }
-            }
-        }
-        return empty($this->notAllowedMountPoints);
-    }
-
-    /**
-     * Return a mount point according to an file mount identifier.
-     *
-     * @param string $identifier
-     * @return array
-     */
-    protected function fetchMountPoint($identifier)
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_filemounts');
-        return $queryBuilder
-            ->select('*')
-            ->from('sys_filemounts')
-            ->where('uid = ' . $identifier)
-            ->execute()
-            ->fetch();
-    }
-
-    /**
-     * Format a message whenever mount points privilege are not OK.
-     *
-     * @return string
-     */
-    protected function formatMessageForMountPoints()
-    {
-
-        $storage = $this->getMediaModule()->getCurrentStorage();
-        $backendUser = $this->getBackendUser();
-
-        foreach ($this->notAllowedMountPoints as $notAllowedMountPoints) {
-            $list = sprintf('<li>"%s" with path %s</li>',
-                $notAllowedMountPoints['title'],
-                $notAllowedMountPoints['path']
-            );
-
-        }
-
-        $result = <<< EOF
+		return $result;
+	}
+
+	/**
+	 * Check whether mount points privilege are ok.
+	 *
+	 * @return boolean
+	 */
+	protected function checkMountPoints()
+	{
+		if (!$this->getBackendUser()->isAdmin()) {
+
+			$fileMounts = $this->getBackendUser()->getFileMountRecords();
+
+			$fileMountIdentifiers = [];
+			foreach ($fileMounts as $fileMount) {
+				$fileMountIdentifiers[] = $fileMount['uid'];
+			}
+
+			$storage = $this->getMediaModule()->getCurrentStorage();
+			$storageRecord = $storage->getStorageRecord();
+			$fieldNames = array(
+				'mount_point_file_type_1',
+				'mount_point_file_type_2',
+				'mount_point_file_type_3',
+				'mount_point_file_type_4',
+				'mount_point_file_type_5',
+			);
+			foreach ($fieldNames as $fileName) {
+				$fileMountIdentifier = (int)$storageRecord[$fileName];
+				if ($fileMountIdentifier > 0 && !in_array($fileMountIdentifier, $fileMountIdentifiers)) {
+					$this->notAllowedMountPoints[] = $this->fetchMountPoint($fileMountIdentifier);
+				} else {
+					# $fileMountIdentifier
+					$folder = $storage->getRootLevelFolder();
+				}
+			}
+		}
+		return empty($this->notAllowedMountPoints);
+	}
+
+	/**
+	 * Return a mount point according to an file mount identifier.
+	 *
+	 * @param string $identifier
+	 * @return array
+	 */
+	protected function fetchMountPoint($identifier)
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_filemounts');
+		return $queryBuilder
+			->select('*')
+			->from('sys_filemounts')
+			->where('uid = ' . $identifier)
+			->execute()
+			->fetch();
+	}
+
+	/**
+	 * Format a message whenever mount points privilege are not OK.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForMountPoints()
+	{
+
+		$storage = $this->getMediaModule()->getCurrentStorage();
+		$backendUser = $this->getBackendUser();
+
+		foreach ($this->notAllowedMountPoints as $notAllowedMountPoints) {
+			$list = sprintf('<li>"%s" with path %s</li>',
+				$notAllowedMountPoints['title'],
+				$notAllowedMountPoints['path']
+			);
+
+		}
+
+		$result = <<< EOF
 			<div class="alert alert-warning">
 					<div class="alert-title">
 						File mount are wrongly configured for user "{$backendUser->user['username']}".
@@ -293,54 +293,54 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * @return boolean
-     */
-    protected function canBeInitializedSilently()
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $count = $queryBuilder
-            ->count('*')
-            ->from('sys_file')
-            ->execute()
-            ->fetchColumn(0);
-        return (int)$count;
-
-    }
-
-    /**
-     * Check whether the column "total_of_references" has been already processed once.
-     *
-     * @return boolean
-     */
-    protected function checkColumnNumberOfReferences()
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $file = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where('number_of_references > 0')
-            ->execute()
-            ->fetch();
-
-        return !empty($file);
-    }
-
-    /**
-     * Format a message if columns "total_of_references" looks wrong.
-     *
-     * @param int $numberOfFile
-     * @return string
-     */
-    protected function formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFile)
-    {
-
-        $result = <<< EOF
+		return $result;
+	}
+
+	/**
+	 * @return boolean
+	 */
+	protected function canBeInitializedSilently()
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$count = $queryBuilder
+			->count('*')
+			->from('sys_file')
+			->execute()
+			->fetchColumn(0);
+		return (int)$count;
+
+	}
+
+	/**
+	 * Check whether the column "total_of_references" has been already processed once.
+	 *
+	 * @return boolean
+	 */
+	protected function checkColumnNumberOfReferences()
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$file = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where('number_of_references > 0')
+			->execute()
+			->fetch();
+
+		return !empty($file);
+	}
+
+	/**
+	 * Format a message if columns "total_of_references" looks wrong.
+	 *
+	 * @param int $numberOfFile
+	 * @return string
+	 */
+	protected function formatMessageForSilentlyUpdatedColumnNumberOfReferences($numberOfFile)
+	{
+
+		$result = <<< EOF
 			<div class="alert alert-success">
 				<div class="alert-title">
 						Initialized column "number_of_references" for ${numberOfFile} files
@@ -357,19 +357,19 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
+		return $result;
+	}
 
 
-    /**
-     * Format a message if columns "total_of_references" looks wrong.
-     *
-     * @return string
-     */
-    protected function formatMessageForUpdateRequiredColumnNumberOfReferences()
-    {
+	/**
+	 * Format a message if columns "total_of_references" looks wrong.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageForUpdateRequiredColumnNumberOfReferences()
+	{
 
-        $result = <<< EOF
+		$result = <<< EOF
 			<div class="alert alert-warning">
 				<div class="alert-title">
 						Column "number_of_references" requires to be initialized.
@@ -388,36 +388,36 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+		return $result;
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
         }
 
         $storage = $this->getMediaModule()->getCurrentStorage();
-        $this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = ' . $storage->getUid(), $values);
+        $this->getDatabaseConnection()->exec_UPDATEquery($tableName, 'uid = '.$storage->getUid(), $values);
     }
 
     /**
@@ -111,7 +111,7 @@ 
      */
     protected function getWarmUpSemaphoreFile()
     {
-        return PATH_site . 'typo3temp/.media_cache_warmed_up';
+        return PATH_site.'typo3temp/.media_cache_warmed_up';
     }
 
     /**
@@ -254,7 +254,7 @@ 
         return $queryBuilder
             ->select('*')
             ->from('sys_filemounts')
-            ->where('uid = ' . $identifier)
+            ->where('uid = '.$identifier)
             ->execute()
             ->fetch();
     }

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/Cache/CacheService.php

Indentation +243 added lines, -243 removed lines

@@ -22,247 +22,247 @@
 class CacheService
 {
 
-    /**
-     * Traverse all files and initialize cache values.
-     *
-     * @return int
-     */
-    public function warmUp()
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $rows = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where('storage > 0')
-            ->execute()
-            ->fetchAll();
-
-        $counter = 0;
-        foreach ($rows as $row) {
-
-            $fileIdentifier = $row['uid'];
-            $totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
-
-            $values = array(
-                'number_of_references' => $totalNumberOfReferences
-            );
-
-            $this->getDataService()->update(
-                'sys_file',
-                $values,
-                [
-                    'uid' => $fileIdentifier
-                ]
-            );
-            $counter++;
-        }
-
-        return $counter;
-    }
-
-    /**
-     * Clear all possible cache related to a file.
-     * This method is useful when replacing a file for instance.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function clearCache(File $file)
-    {
-
-        $this->clearCachePages($file);
-        $this->flushProcessedFiles($file);
-    }
-
-    /**
-     * Remove all processed files that belong to the given File object.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function flushProcessedFiles(File $file)
-    {
-
-        /** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
-        foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
-            if ($processedFile->exists()) {
-                $processedFile->delete(true);
-            }
-
-            $this->getDataService()->delete(
-                'sys_file_processedfile',
-                [
-                    'uid' => (int)$processedFile->getUid()
-                ]
-            );
-        }
-    }
-
-    /**
-     * Return a processed file repository
-     *
-     * @return \TYPO3\CMS\Core\Resource\ProcessedFileRepository|object
-     */
-    protected function getProcessedFileRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ProcessedFileRepository::class);
-    }
-
-    /**
-     * Returns the file references.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function clearCachePages($file)
-    {
-
-        /** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $tce = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
-        $tce->start([], []);
-
-        #$pages = array_merge(
-        #    $this->findPagesWithFileReferences($file),
-        #    $this->findPagesWithSoftReferences($file)
-        #);
-
-        // Previous code which does not work in TYPO3 CMS 7 LTS.
-        // It is adviced to use "registerPageCacheClearing" but how?
-        #foreach (array_unique($pages) as $page) {
-        #    $tce->clear_cache('pages', $page);
-        #}
-        $tce->clear_cacheCmd('pages');
-    }
-
-    /**
-     * Find all pages which contains file references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    protected function findPagesWithFileReferences($file)
-    {
-
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file_reference');
-        $rows = $queryBuilder
-            ->select('pid')
-            ->from('sys_file_reference')
-            ->groupBy('pid') // no support for distinct
-            ->andWhere(
-                'pid > 0',
-                'uid_local = ' . $file->getUid()
-            )
-            ->execute()
-            ->fetchAll();
-
-        foreach ($rows as $row) {
-            $pages[] = $row['pid'];
-
-        }
-
-        return $pages;
-    }
-
-    /**
-     * Find all pages which have soft references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    protected function findPagesWithSoftReferences(File $file)
-    {
-
-        // todo here...
-        $subClauseParts = array(
-            'deleted = 0',
-            '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
-            'ref_table = "sys_file"',
-            'tablename = "tt_content"',
-            'ref_uid = ' . $file->getUid(),
-        );
-
-        $rows = $this->getDatabaseConnection()->exec_SELECTquery(
-            'DISTINCT pid',
-            'tt_content',
-            sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
-                implode(' AND ', $subClauseParts),
-                $this->getWhereClauseForEnabledFields('tt_content')
-            )
-        );
-
-        // Compute result
-        $pages = [];
-        while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
-            $pages[] = $affectedPage['pid'];
-        }
-
-        return $pages;
-    }
-
-    /**
-     * Get the WHERE clause for the enabled fields given a $tableName.
-     *
-     * @param string $tableName
-     * @return string
-     */
-    protected function getWhereClauseForEnabledFields($tableName)
-    {
-        if ($this->isFrontendMode()) {
-            // frontend context
-            $whereClause = $this->getPageRepository()->deleteClause($tableName);
-        } else {
-            // backend context
-            $whereClause = BackendUtility::deleteClause($tableName);
-        }
-        return $whereClause;
-    }
-
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return string
-     */
-    protected function isFrontendMode()
-    {
-        return TYPO3_MODE == 'FE';
-    }
-
-    /**
-     * Returns an instance of the page repository.
-     *
-     * @return \TYPO3\CMS\Frontend\Page\PageRepository
-     */
-    protected function getPageRepository()
-    {
-        return $GLOBALS['TSFE']->sys_page;
-    }
-
-    /**
-     * @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 \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
+	/**
+	 * Traverse all files and initialize cache values.
+	 *
+	 * @return int
+	 */
+	public function warmUp()
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$rows = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where('storage > 0')
+			->execute()
+			->fetchAll();
+
+		$counter = 0;
+		foreach ($rows as $row) {
+
+			$fileIdentifier = $row['uid'];
+			$totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
+
+			$values = array(
+				'number_of_references' => $totalNumberOfReferences
+			);
+
+			$this->getDataService()->update(
+				'sys_file',
+				$values,
+				[
+					'uid' => $fileIdentifier
+				]
+			);
+			$counter++;
+		}
+
+		return $counter;
+	}
+
+	/**
+	 * Clear all possible cache related to a file.
+	 * This method is useful when replacing a file for instance.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function clearCache(File $file)
+	{
+
+		$this->clearCachePages($file);
+		$this->flushProcessedFiles($file);
+	}
+
+	/**
+	 * Remove all processed files that belong to the given File object.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function flushProcessedFiles(File $file)
+	{
+
+		/** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
+		foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
+			if ($processedFile->exists()) {
+				$processedFile->delete(true);
+			}
+
+			$this->getDataService()->delete(
+				'sys_file_processedfile',
+				[
+					'uid' => (int)$processedFile->getUid()
+				]
+			);
+		}
+	}
+
+	/**
+	 * Return a processed file repository
+	 *
+	 * @return \TYPO3\CMS\Core\Resource\ProcessedFileRepository|object
+	 */
+	protected function getProcessedFileRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ProcessedFileRepository::class);
+	}
+
+	/**
+	 * Returns the file references.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function clearCachePages($file)
+	{
+
+		/** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$tce = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+		$tce->start([], []);
+
+		#$pages = array_merge(
+		#    $this->findPagesWithFileReferences($file),
+		#    $this->findPagesWithSoftReferences($file)
+		#);
+
+		// Previous code which does not work in TYPO3 CMS 7 LTS.
+		// It is adviced to use "registerPageCacheClearing" but how?
+		#foreach (array_unique($pages) as $page) {
+		#    $tce->clear_cache('pages', $page);
+		#}
+		$tce->clear_cacheCmd('pages');
+	}
+
+	/**
+	 * Find all pages which contains file references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	protected function findPagesWithFileReferences($file)
+	{
+
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file_reference');
+		$rows = $queryBuilder
+			->select('pid')
+			->from('sys_file_reference')
+			->groupBy('pid') // no support for distinct
+			->andWhere(
+				'pid > 0',
+				'uid_local = ' . $file->getUid()
+			)
+			->execute()
+			->fetchAll();
+
+		foreach ($rows as $row) {
+			$pages[] = $row['pid'];
+
+		}
+
+		return $pages;
+	}
+
+	/**
+	 * Find all pages which have soft references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	protected function findPagesWithSoftReferences(File $file)
+	{
+
+		// todo here...
+		$subClauseParts = array(
+			'deleted = 0',
+			'(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
+			'ref_table = "sys_file"',
+			'tablename = "tt_content"',
+			'ref_uid = ' . $file->getUid(),
+		);
+
+		$rows = $this->getDatabaseConnection()->exec_SELECTquery(
+			'DISTINCT pid',
+			'tt_content',
+			sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
+				implode(' AND ', $subClauseParts),
+				$this->getWhereClauseForEnabledFields('tt_content')
+			)
+		);
+
+		// Compute result
+		$pages = [];
+		while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
+			$pages[] = $affectedPage['pid'];
+		}
+
+		return $pages;
+	}
+
+	/**
+	 * Get the WHERE clause for the enabled fields given a $tableName.
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	protected function getWhereClauseForEnabledFields($tableName)
+	{
+		if ($this->isFrontendMode()) {
+			// frontend context
+			$whereClause = $this->getPageRepository()->deleteClause($tableName);
+		} else {
+			// backend context
+			$whereClause = BackendUtility::deleteClause($tableName);
+		}
+		return $whereClause;
+	}
+
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return string
+	 */
+	protected function isFrontendMode()
+	{
+		return TYPO3_MODE == 'FE';
+	}
+
+	/**
+	 * Returns an instance of the page repository.
+	 *
+	 * @return \TYPO3\CMS\Frontend\Page\PageRepository
+	 */
+	protected function getPageRepository()
+	{
+		return $GLOBALS['TSFE']->sys_page;
+	}
+
+	/**
+	 * @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 \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
             ->groupBy('pid') // no support for distinct
             ->andWhere(
                 'pid > 0',
-                'uid_local = ' . $file->getUid()
+                'uid_local = '.$file->getUid()
             )
             ->execute()
             ->fetchAll();
@@ -180,7 +180,7 @@ 
             '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
             'ref_table = "sys_file"',
             'tablename = "tt_content"',
-            'ref_uid = ' . $file->getUid(),
+            'ref_uid = '.$file->getUid(),
         );
 
         $rows = $this->getDatabaseConnection()->exec_SELECTquery(

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/Tool/MissingFilesFinderTool.php

Indentation +123 added lines, -123 removed lines

@@ -21,129 +21,129 @@
 class MissingFilesFinderTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find missing files';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', PATH_site);
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-
-        // Possible clean up of missing files if the User has clicked so.
-        if (!empty($arguments['deleteMissingFiles'])) {
-            $this->deleteMissingFilesAction($arguments['files']);
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $missingReports = [];
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            if ($storage->isOnline()) {
-                $missingFiles = $this->getIndexAnalyser()->searchForMissingFiles($storage);
-
-                $missingReports[] = array(
-                    'storage' => $storage,
-                    'missingFiles' => $missingFiles,
-                    'numberOfMissingFiles' => count($missingFiles),
-                );
-            }
-        }
-
-        $view->assign('missingReports', $missingReports);
-
-        return $view->render();
-    }
-
-    /**
-     * Delete files given as parameter.
-     * This is a special case as we have a missing file in the file system
-     * As a result, we can't use $fileObject->delete(); which will
-     * raise exception "Error while fetching permissions".
-     *
-     * @param array $files
-     * @return void
-     */
-    protected function deleteMissingFilesAction(array $files = [])
-    {
-
-        foreach ($files as $fileUid) {
-
-            /** @var \TYPO3\CMS\Core\Resource\File $file */
-            try {
-                $file = ResourceFactory::getInstance()->getFileObject($fileUid);
-                if ($file) {
-                    // The case is special as we have a missing file in the file system
-                    // As a result, we can't use $fileObject->delete(); which will
-                    // raise exception "Error while fetching permissions"
-                    $this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find missing files';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', PATH_site);
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+
+		// Possible clean up of missing files if the User has clicked so.
+		if (!empty($arguments['deleteMissingFiles'])) {
+			$this->deleteMissingFilesAction($arguments['files']);
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$missingReports = [];
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			if ($storage->isOnline()) {
+				$missingFiles = $this->getIndexAnalyser()->searchForMissingFiles($storage);
+
+				$missingReports[] = array(
+					'storage' => $storage,
+					'missingFiles' => $missingFiles,
+					'numberOfMissingFiles' => count($missingFiles),
+				);
+			}
+		}
+
+		$view->assign('missingReports', $missingReports);
+
+		return $view->render();
+	}
+
+	/**
+	 * Delete files given as parameter.
+	 * This is a special case as we have a missing file in the file system
+	 * As a result, we can't use $fileObject->delete(); which will
+	 * raise exception "Error while fetching permissions".
+	 *
+	 * @param array $files
+	 * @return void
+	 */
+	protected function deleteMissingFilesAction(array $files = [])
+	{
+
+		foreach ($files as $fileUid) {
+
+			/** @var \TYPO3\CMS\Core\Resource\File $file */
+			try {
+				$file = ResourceFactory::getInstance()->getFileObject($fileUid);
+				if ($file) {
+					// The case is special as we have a missing file in the file system
+					// As a result, we can't use $fileObject->delete(); which will
+					// raise exception "Error while fetching permissions"
+					$this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 
 }
 

Classes/Tool/DuplicateFilesFinderTool.php

Indentation +200 added lines, -200 removed lines

@@ -20,206 +20,206 @@
 class DuplicateFilesFinderTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find duplicate Files';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('isAdmin', $this->getBackendUser()->isAdmin());
-        $view->assign('sitePath', PATH_site);
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-
-        // Possible clean up of missing files if the User has clicked so.
-        if (!empty($arguments['deleteDuplicateFiles'])) {
-            $this->deleteMissingFilesAction($arguments['files']);
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $duplicateFilesReports = [];
-
-        if ($this->getBackendUser()->isAdmin()) {
-            foreach ($this->getStorageRepository()->findAll() as $storage) {
-                if ($storage->isOnline()) {
-                    $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
-                    $duplicateFilesReports[] = array(
-                        'storage' => $storage,
-                        'duplicateFiles' => $duplicateFiles,
-                        'numberOfDuplicateFiles' => count($duplicateFiles),
-                    );
-                }
-            }
-        } else {
-
-            $fileMounts = $this->getBackendUser()->getFileMountRecords();
-
-            $allowedStorages = [];
-            foreach ($fileMounts as $fileMount) {
-                if ((bool)$fileMount['read_only']) {
-                    continue;
-                }
-
-                if (!isset($allowedStorages[$fileMount['base']])) {
-                    $allowedStorages[$fileMount['base']] = [];
-                }
-                if (!in_array($fileMount['base'], $allowedStorages)) {
-                    $allowedStorages[$fileMount['base']][] = $fileMount['path'];
-                }
-            }
-
-            foreach ($allowedStorages as $storageIdentifier => $allowedMountPoints) {
-                $storage = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
-
-                if ($storage->isOnline()) {
-
-                    $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
-
-                    // Filter duplicates files
-                    foreach ($duplicateFiles as $key => $files) {
-
-                        $filteredFiles = [];
-                        foreach ($files as $file) {
-
-                            foreach ($allowedMountPoints as $allowedMountPoint) {
-
-                                $pattern = '%^' . $allowedMountPoint . '%isU';
-                                if (preg_match($pattern, $file['identifier'])) {
-                                    $filteredFiles[] = $file;
-                                    break; // no need to further loop around, stop the loop.
-                                }
-                            }
-                        }
-
-                        // We need more than 1 files to be shown as duplicate.
-                        if (count($filteredFiles) > 1) {
-                            $duplicateFiles[$key] = $filteredFiles;
-                        } else {
-                            unset($duplicateFiles[$key]);
-                        }
-                    }
-                    $duplicateFilesReports[] = array(
-                        'storage' => $storage,
-                        'duplicateFiles' => $duplicateFiles,
-                        'numberOfDuplicateFiles' => count($duplicateFiles),
-                    );
-
-                }
-            }
-        }
-
-        $view->assign('duplicateFilesReports', $duplicateFilesReports);
-
-        return $view->render();
-    }
-
-    /**
-     * Delete files given as parameter.
-     * This is a special case as we have a missing file in the file system
-     * As a result, we can't use $fileObject->delete(); which will
-     * raise exception "Error while fetching permissions".
-     *
-     * @param array $files
-     * @return void
-     */
-    protected function deleteMissingFilesAction(array $files = [])
-    {
-
-        foreach ($files as $fileUid) {
-
-            /** @var \TYPO3\CMS\Core\Resource\File $file */
-            try {
-                $file = ResourceFactory::getInstance()->getFileObject($fileUid);
-                if ($file->exists()) {
-
-                    $numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
-                    if ($numberOfReferences === 0) {
-                        $file->delete();
-                    }
-                } else {
-                    $this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::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);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return true;
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find duplicate Files';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('isAdmin', $this->getBackendUser()->isAdmin());
+		$view->assign('sitePath', PATH_site);
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+
+		// Possible clean up of missing files if the User has clicked so.
+		if (!empty($arguments['deleteDuplicateFiles'])) {
+			$this->deleteMissingFilesAction($arguments['files']);
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$duplicateFilesReports = [];
+
+		if ($this->getBackendUser()->isAdmin()) {
+			foreach ($this->getStorageRepository()->findAll() as $storage) {
+				if ($storage->isOnline()) {
+					$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
+					$duplicateFilesReports[] = array(
+						'storage' => $storage,
+						'duplicateFiles' => $duplicateFiles,
+						'numberOfDuplicateFiles' => count($duplicateFiles),
+					);
+				}
+			}
+		} else {
+
+			$fileMounts = $this->getBackendUser()->getFileMountRecords();
+
+			$allowedStorages = [];
+			foreach ($fileMounts as $fileMount) {
+				if ((bool)$fileMount['read_only']) {
+					continue;
+				}
+
+				if (!isset($allowedStorages[$fileMount['base']])) {
+					$allowedStorages[$fileMount['base']] = [];
+				}
+				if (!in_array($fileMount['base'], $allowedStorages)) {
+					$allowedStorages[$fileMount['base']][] = $fileMount['path'];
+				}
+			}
+
+			foreach ($allowedStorages as $storageIdentifier => $allowedMountPoints) {
+				$storage = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
+
+				if ($storage->isOnline()) {
+
+					$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
+
+					// Filter duplicates files
+					foreach ($duplicateFiles as $key => $files) {
+
+						$filteredFiles = [];
+						foreach ($files as $file) {
+
+							foreach ($allowedMountPoints as $allowedMountPoint) {
+
+								$pattern = '%^' . $allowedMountPoint . '%isU';
+								if (preg_match($pattern, $file['identifier'])) {
+									$filteredFiles[] = $file;
+									break; // no need to further loop around, stop the loop.
+								}
+							}
+						}
+
+						// We need more than 1 files to be shown as duplicate.
+						if (count($filteredFiles) > 1) {
+							$duplicateFiles[$key] = $filteredFiles;
+						} else {
+							unset($duplicateFiles[$key]);
+						}
+					}
+					$duplicateFilesReports[] = array(
+						'storage' => $storage,
+						'duplicateFiles' => $duplicateFiles,
+						'numberOfDuplicateFiles' => count($duplicateFiles),
+					);
+
+				}
+			}
+		}
+
+		$view->assign('duplicateFilesReports', $duplicateFilesReports);
+
+		return $view->render();
+	}
+
+	/**
+	 * Delete files given as parameter.
+	 * This is a special case as we have a missing file in the file system
+	 * As a result, we can't use $fileObject->delete(); which will
+	 * raise exception "Error while fetching permissions".
+	 *
+	 * @param array $files
+	 * @return void
+	 */
+	protected function deleteMissingFilesAction(array $files = [])
+	{
+
+		foreach ($files as $fileUid) {
+
+			/** @var \TYPO3\CMS\Core\Resource\File $file */
+			try {
+				$file = ResourceFactory::getInstance()->getFileObject($fileUid);
+				if ($file->exists()) {
+
+					$numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
+					if ($numberOfReferences === 0) {
+						$file->delete();
+					}
+				} else {
+					$this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::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);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return true;
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 
                             foreach ($allowedMountPoints as $allowedMountPoint) {
 
-                                $pattern = '%^' . $allowedMountPoint . '%isU';
+                                $pattern = '%^'.$allowedMountPoint.'%isU';
                                 if (preg_match($pattern, $file['identifier'])) {
                                     $filteredFiles[] = $file;
                                     break; // no need to further loop around, stop the loop.

Classes/Tool/ThumbnailGeneratorTool.php

Indentation +119 added lines, -119 removed lines

@@ -18,125 +18,125 @@
 class ThumbnailGeneratorTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Generate thumbnails';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', PATH_site);
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-
-        $reports = [];
-
-        $limit = 500; // default value
-        $newOffset = 0;
-
-        // Possible clean up of missing files if the User has clicked so.
-        if (isset($arguments['limit']) && isset($arguments['offset'])) {
-
-            $limit = (int)$arguments['limit'];
-            $offset = (int)$arguments['offset'];
-
-            foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-                if ($storage->isOnline()) {
-
-                    $thumbnailGenerator = $this->getThumbnailGenerator();
-                    $thumbnailGenerator
-                        ->setStorage($storage)
-                        ->generate($limit, $offset);
-
-                    $formattedResultSet = [];
-                    $resultSet = $thumbnailGenerator->getResultSet();
-                    $processedFileIdentifiers = $thumbnailGenerator->getNewProcessedFileIdentifiers();
-
-                    foreach ($processedFileIdentifiers as $fileIdentifier => $processedFileIdentifier) {
-                        $result = $resultSet[$fileIdentifier];
-                        $formattedResultSet[] = sprintf('* File "%s": %s %s',
-                            $result['fileUid'],
-                            $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
-                        );
-                    }
-
-                    $reports[] = array(
-                        'storage' => $storage,
-                        'isStorageOnline' => true,
-                        'resultSet' => $formattedResultSet,
-                        'numberOfProcessedFiles' => $thumbnailGenerator->getNumberOfProcessedFiles(),
-                        'numberOfTraversedFiles' => $thumbnailGenerator->getNumberOfTraversedFiles(),
-                        'numberOfMissingFiles' => $thumbnailGenerator->getNumberOfMissingFiles(),
-                        'totalNumberOfFiles' => $thumbnailGenerator->getTotalNumberOfFiles(),
-                    );
-                } else {
-                    $reports[] = array(
-                        'storage' => $storage,
-                        'isStorageOnline' => false,
-                    );
-                }
-            }
-
-            $newOffset = $limit + $offset;
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $view->assign('limit', $limit);
-        $view->assign('offset', $newOffset);
-        $view->assign('reports', $reports);
-        return $view->render();
-    }
-
-    /**
-     * @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);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Generate thumbnails';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', PATH_site);
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+
+		$reports = [];
+
+		$limit = 500; // default value
+		$newOffset = 0;
+
+		// Possible clean up of missing files if the User has clicked so.
+		if (isset($arguments['limit']) && isset($arguments['offset'])) {
+
+			$limit = (int)$arguments['limit'];
+			$offset = (int)$arguments['offset'];
+
+			foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+				if ($storage->isOnline()) {
+
+					$thumbnailGenerator = $this->getThumbnailGenerator();
+					$thumbnailGenerator
+						->setStorage($storage)
+						->generate($limit, $offset);
+
+					$formattedResultSet = [];
+					$resultSet = $thumbnailGenerator->getResultSet();
+					$processedFileIdentifiers = $thumbnailGenerator->getNewProcessedFileIdentifiers();
+
+					foreach ($processedFileIdentifiers as $fileIdentifier => $processedFileIdentifier) {
+						$result = $resultSet[$fileIdentifier];
+						$formattedResultSet[] = sprintf('* File "%s": %s %s',
+							$result['fileUid'],
+							$result['fileIdentifier'],
+							empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+						);
+					}
+
+					$reports[] = array(
+						'storage' => $storage,
+						'isStorageOnline' => true,
+						'resultSet' => $formattedResultSet,
+						'numberOfProcessedFiles' => $thumbnailGenerator->getNumberOfProcessedFiles(),
+						'numberOfTraversedFiles' => $thumbnailGenerator->getNumberOfTraversedFiles(),
+						'numberOfMissingFiles' => $thumbnailGenerator->getNumberOfMissingFiles(),
+						'totalNumberOfFiles' => $thumbnailGenerator->getTotalNumberOfFiles(),
+					);
+				} else {
+					$reports[] = array(
+						'storage' => $storage,
+						'isStorageOnline' => false,
+					);
+				}
+			}
+
+			$newOffset = $limit + $offset;
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$view->assign('limit', $limit);
+		$view->assign('offset', $newOffset);
+		$view->assign('reports', $reports);
+		return $view->render();
+	}
+
+	/**
+	 * @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);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 
 }
 

Classes/Tool/DuplicateRecordsFinderTool.php

Indentation +80 added lines, -80 removed lines

@@ -19,86 +19,86 @@
 class DuplicateRecordsFinderTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find duplicate Records';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', PATH_site);
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $duplicateRecordsReports = [];
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            if ($storage->isOnline()) {
-                $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
-                $duplicateRecordsReports[] = array(
-                    'storage' => $storage,
-                    'duplicateFiles' => $duplicateFiles,
-                    'numberOfDuplicateFiles' => count($duplicateFiles),
-                );
-            }
-        }
-
-        $view->assign('duplicateRecordsReports', $duplicateRecordsReports);
-
-        return $view->render();
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find duplicate Records';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', PATH_site);
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$duplicateRecordsReports = [];
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			if ($storage->isOnline()) {
+				$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
+				$duplicateRecordsReports[] = array(
+					'storage' => $storage,
+					'duplicateFiles' => $duplicateFiles,
+					'numberOfDuplicateFiles' => count($duplicateFiles),
+				);
+			}
+		}
+
+		$view->assign('duplicateRecordsReports', $duplicateRecordsReports);
+
+		return $view->render();
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 
 }