fabarea / media

Classes/View/Button/ImageEditorButton.php

Indentation +38 added lines, -38 removed lines

@@ -20,43 +20,43 @@
 class ImageEditorButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a "image-editor" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        $button = '';
-        if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
-            $button = $this->makeLinkButton()
-                ->setHref($this->getImageEditorUri($object))
-                ->setDataAttributes([
-                    'uid' => $object->getUid(),
-                    'toggle' => 'tooltip',
-                ])
-                ->setClasses('btn-imageEditor')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:edit_image'))
-                ->setIcon($this->getIconFactory()->getIcon('extensions-media-image-edit', Icon::SIZE_SMALL))
-                ->render();
-        }
-        return $button;
-    }
+	/**
+	 * Renders a "image-editor" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		$button = '';
+		if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
+			$button = $this->makeLinkButton()
+				->setHref($this->getImageEditorUri($object))
+				->setDataAttributes([
+					'uid' => $object->getUid(),
+					'toggle' => 'tooltip',
+				])
+				->setClasses('btn-imageEditor')
+				->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:edit_image'))
+				->setIcon($this->getIconFactory()->getIcon('extensions-media-image-edit', Icon::SIZE_SMALL))
+				->render();
+		}
+		return $button;
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     */
-    protected function getImageEditorUri(Content $object)
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'ImageEditor',
-                'action' => 'show',
-                'file' => $object->getUid(),
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @param Content $object
+	 * @return string
+	 */
+	protected function getImageEditorUri(Content $object)
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'ImageEditor',
+				'action' => 'show',
+				'file' => $object->getUid(),
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 }

Classes/View/Button/FilePickerButton.php

Indentation +38 added lines, -38 removed lines

@@ -20,44 +20,44 @@
 class FilePickerButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a "file-picker" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        $button = '';
-        if ($this->getModuleLoader()->hasPlugin('filePicker')) {
-            $button = $this->makeLinkButton()
-                ->setHref($this->getFilePickerUri($object))
-                ->setDataAttributes([
-                    'uid' => $object->getUid(),
-                    'toggle' => 'tooltip',
-                ])
-                ->setClasses('btn-filePicker')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:edit_image'))
-                ->setIcon($this->getIconFactory()->getIcon('extensions-media-image-export', Icon::SIZE_SMALL))
-                ->render();
+	/**
+	 * Renders a "file-picker" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		$button = '';
+		if ($this->getModuleLoader()->hasPlugin('filePicker')) {
+			$button = $this->makeLinkButton()
+				->setHref($this->getFilePickerUri($object))
+				->setDataAttributes([
+					'uid' => $object->getUid(),
+					'toggle' => 'tooltip',
+				])
+				->setClasses('btn-filePicker')
+				->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:edit_image'))
+				->setIcon($this->getIconFactory()->getIcon('extensions-media-image-export', Icon::SIZE_SMALL))
+				->render();
 
-        }
-        return $button;
-    }
+		}
+		return $button;
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     */
-    protected function getFilePickerUri(Content $object)
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'Asset',
-                'action' => 'download',
-                'file' => $object->getUid(),
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @param Content $object
+	 * @return string
+	 */
+	protected function getFilePickerUri(Content $object)
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'Asset',
+				'action' => 'download',
+				'file' => $object->getUid(),
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 }

Classes/Facet/ActionPermissionFacet.php

Indentation +243 added lines, -243 removed lines

@@ -23,248 +23,248 @@
 class ActionPermissionFacet implements FacetInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $name = '__action_permission';
-
-    /**
-     * @var string
-     */
-    protected $label = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:permission';
-
-    /**
-     * @var array
-     */
-    protected $suggestions = array(
-        'r' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.read_only',
-        'w' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.write',
-    );
-
-    /**
-     * @var string
-     */
-    protected $fieldNameAndPath = '';
-
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var bool
-     */
-    protected $canModifyMatcher = false;
-
-    /**
-     * Constructor of a Generic Facet in Vidi.
-     *
-     * @param string $name
-     * @param string $label
-     * @param array $suggestions
-     * @param string $fieldNameAndPath
-     */
-    public function __construct($name = '', $label = '', array $suggestions = [], $fieldNameAndPath = '')
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->getLanguageService()->sL($this->label);
-    }
-
-    /**
-     * @return array
-     */
-    public function getSuggestions()
-    {
-        $suggestions = [];
-        foreach ($this->suggestions as $key => $label) {
-            $suggestions[] = array($key => $this->getLanguageService()->sL($label));
-        }
-
-        return $suggestions;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSuggestions()
-    {
-        return true;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType)
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function canModifyMatcher()
-    {
-        return $this->canModifyMatcher;
-    }
-
-    /**
-     * @param Matcher $matcher
-     * @param $value
-     * @return Matcher
-     */
-    public function modifyMatcher(Matcher $matcher, $value)
-    {
-        return $matcher;
-    }
-
-    /**
-     * @param AfterFindContentObjectsSignalArguments $signalArguments
-     * @return array
-     */
-    public function modifyResultSet(AfterFindContentObjectsSignalArguments $signalArguments)
-    {
-
-        if ($signalArguments->getDataType() === 'sys_file') {
-
-            $queryParts = $this->getQueryParts();
-
-            if (!empty($queryParts)) {
-                $permission = $this->getPermissionValue($queryParts);
-
-                if ($permission) {
-
-                    // We are force to query the content repository again here without limit
-                    $matcher = $signalArguments->getMatcher();
-                    $order = $signalArguments->getOrder();
-                    $objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order);
-
-                    $filteredObjects = [];
-                    foreach ($objects as $object) {
-
-                        $file = $this->getFileConverter()->convert($object->getUid());
-                        if ($permission === 'read' && !$file->checkActionPermission('write')) {
-                            $filteredObjects[] = $object;
-                        } elseif ($permission === 'write' && $file->checkActionPermission('write')) {
-                            $filteredObjects[] = $object;
-                        }
-                    }
-
-                    // Only take part of the array according to offset and limit.
-                    $offset = $signalArguments->getOffset();
-                    $limit = $signalArguments->getLimit();
-                    $signalArguments->setContentObjects(array_slice($filteredObjects, $offset, $limit));
-
-                    // Count number of records
-                    $signalArguments->setNumberOfObjects(count($filteredObjects));
-                    $signalArguments->setHasBeenProcessed(true);
-                }
-            }
-        }
-
-        return array($signalArguments);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getQueryParts()
-    {
-
-        // Transmit recursive selection parameter.
-        $parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $parameters = GeneralUtility::_GP($parameterPrefix);
-
-        $queryParts = [];
-        if (!empty($parameters['searchTerm'])) {
-            $query = rawurldecode($parameters['searchTerm']);
-            $queryParts = json_decode($query, true);
-        }
-
-        return $queryParts;
-    }
-
-    /**
-     * Retrieve the search permission value.
-     *
-     * @param array $queryParts
-     * @return string
-     */
-    protected function getPermissionValue(array $queryParts)
-    {
-        $permission = '';
-
-        // Check also amongst labels.
-        $labelReadOnly = $this->getLanguageService()->sL($this->suggestions['r']);
-        $labelWrite = $this->getLanguageService()->sL($this->suggestions['w']);
-
-        foreach ($queryParts as $queryPart) {
-            $facetName = key($queryPart);
-            $value = $queryPart[$facetName];
-            if ($facetName === $this->name) {
-
-                if ($value === 'r' || $value === $labelReadOnly) {
-                    $permission = 'read';
-                } elseif ($value === 'w' || $value === $labelWrite) {
-                    $permission = 'write';
-                }
-            }
-        }
-        return $permission;
-    }
-
-    /**
-     * Magic method implementation for retrieving state.
-     *
-     * @param array $states
-     * @return $this
-     */
-    static public function __set_state($states)
-    {
-        return new ActionPermissionFacet($states['name'], $states['label'], $states['suggestions'], $states['fieldNameAndPath']);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Lang\LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return $GLOBALS['LANG'];
-    }
-
-    /**
-     * @return ContentToFileConverter
-     * @throws \InvalidArgumentException
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(ContentToFileConverter::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     * @throws \InvalidArgumentException
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * @var string
+	 */
+	protected $name = '__action_permission';
+
+	/**
+	 * @var string
+	 */
+	protected $label = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:permission';
+
+	/**
+	 * @var array
+	 */
+	protected $suggestions = array(
+		'r' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.read_only',
+		'w' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.write',
+	);
+
+	/**
+	 * @var string
+	 */
+	protected $fieldNameAndPath = '';
+
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var bool
+	 */
+	protected $canModifyMatcher = false;
+
+	/**
+	 * Constructor of a Generic Facet in Vidi.
+	 *
+	 * @param string $name
+	 * @param string $label
+	 * @param array $suggestions
+	 * @param string $fieldNameAndPath
+	 */
+	public function __construct($name = '', $label = '', array $suggestions = [], $fieldNameAndPath = '')
+	{
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		return $this->getLanguageService()->sL($this->label);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSuggestions()
+	{
+		$suggestions = [];
+		foreach ($this->suggestions as $key => $label) {
+			$suggestions[] = array($key => $this->getLanguageService()->sL($label));
+		}
+
+		return $suggestions;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasSuggestions()
+	{
+		return true;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType)
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function canModifyMatcher()
+	{
+		return $this->canModifyMatcher;
+	}
+
+	/**
+	 * @param Matcher $matcher
+	 * @param $value
+	 * @return Matcher
+	 */
+	public function modifyMatcher(Matcher $matcher, $value)
+	{
+		return $matcher;
+	}
+
+	/**
+	 * @param AfterFindContentObjectsSignalArguments $signalArguments
+	 * @return array
+	 */
+	public function modifyResultSet(AfterFindContentObjectsSignalArguments $signalArguments)
+	{
+
+		if ($signalArguments->getDataType() === 'sys_file') {
+
+			$queryParts = $this->getQueryParts();
+
+			if (!empty($queryParts)) {
+				$permission = $this->getPermissionValue($queryParts);
+
+				if ($permission) {
+
+					// We are force to query the content repository again here without limit
+					$matcher = $signalArguments->getMatcher();
+					$order = $signalArguments->getOrder();
+					$objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order);
+
+					$filteredObjects = [];
+					foreach ($objects as $object) {
+
+						$file = $this->getFileConverter()->convert($object->getUid());
+						if ($permission === 'read' && !$file->checkActionPermission('write')) {
+							$filteredObjects[] = $object;
+						} elseif ($permission === 'write' && $file->checkActionPermission('write')) {
+							$filteredObjects[] = $object;
+						}
+					}
+
+					// Only take part of the array according to offset and limit.
+					$offset = $signalArguments->getOffset();
+					$limit = $signalArguments->getLimit();
+					$signalArguments->setContentObjects(array_slice($filteredObjects, $offset, $limit));
+
+					// Count number of records
+					$signalArguments->setNumberOfObjects(count($filteredObjects));
+					$signalArguments->setHasBeenProcessed(true);
+				}
+			}
+		}
+
+		return array($signalArguments);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getQueryParts()
+	{
+
+		// Transmit recursive selection parameter.
+		$parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$parameters = GeneralUtility::_GP($parameterPrefix);
+
+		$queryParts = [];
+		if (!empty($parameters['searchTerm'])) {
+			$query = rawurldecode($parameters['searchTerm']);
+			$queryParts = json_decode($query, true);
+		}
+
+		return $queryParts;
+	}
+
+	/**
+	 * Retrieve the search permission value.
+	 *
+	 * @param array $queryParts
+	 * @return string
+	 */
+	protected function getPermissionValue(array $queryParts)
+	{
+		$permission = '';
+
+		// Check also amongst labels.
+		$labelReadOnly = $this->getLanguageService()->sL($this->suggestions['r']);
+		$labelWrite = $this->getLanguageService()->sL($this->suggestions['w']);
+
+		foreach ($queryParts as $queryPart) {
+			$facetName = key($queryPart);
+			$value = $queryPart[$facetName];
+			if ($facetName === $this->name) {
+
+				if ($value === 'r' || $value === $labelReadOnly) {
+					$permission = 'read';
+				} elseif ($value === 'w' || $value === $labelWrite) {
+					$permission = 'write';
+				}
+			}
+		}
+		return $permission;
+	}
+
+	/**
+	 * Magic method implementation for retrieving state.
+	 *
+	 * @param array $states
+	 * @return $this
+	 */
+	static public function __set_state($states)
+	{
+		return new ActionPermissionFacet($states['name'], $states['label'], $states['suggestions'], $states['fieldNameAndPath']);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Lang\LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return $GLOBALS['LANG'];
+	}
+
+	/**
+	 * @return ContentToFileConverter
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(ContentToFileConverter::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 
 }

Classes/Controller/ProcessedFileController.php

Indentation +40 added lines, -40 removed lines

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

Classes/Hook/DataHandlerHook.php

Spacing +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
                 $values = array(
                     'number_of_references' => $numberOfReferences
                 );
-                $this->getDatabaseConnection()->exec_UPDATEquery('sys_file', 'uid = ' . $file->getUid(), $values);
+                $this->getDatabaseConnection()->exec_UPDATEquery('sys_file', 'uid = '.$file->getUid(), $values);
             } 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.
@@ -273,7 +273,7 @@ 
     protected function findFileByFileReference($fileReferenceIdentifier)
     {
         $tableName = 'sys_file_reference';
-        $clause = 'uid = ' . $fileReferenceIdentifier;
+        $clause = 'uid = '.$fileReferenceIdentifier;
         #$clause .= BackendUtility::BEenableFields($tableName); // was removed following https://forge.typo3.org/issues/62370
         $clause .= BackendUtility::deleteClause($tableName);
         $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'sys_file_reference', $clause);

Indentation +307 added lines, -307 removed lines

@@ -20,311 +20,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->getDatabaseConnection()->exec_UPDATEquery('sys_file', 'uid = ' . $file->getUid(), $values);
-            } 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
-     * @throws \Exception
-     * @return int
-     */
-    protected function findFileByFileReference($fileReferenceIdentifier)
-    {
-        $tableName = 'sys_file_reference';
-        $clause = 'uid = ' . $fileReferenceIdentifier;
-        #$clause .= BackendUtility::BEenableFields($tableName); // was removed following https://forge.typo3.org/issues/62370
-        $clause .= BackendUtility::deleteClause($tableName);
-        $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'sys_file_reference', $clause);
-
-        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);
-    }
-
-    /**
-     * Wrapper around the global database connection object.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * 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->getDatabaseConnection()->exec_UPDATEquery('sys_file', 'uid = ' . $file->getUid(), $values);
+			} 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
+	 * @throws \Exception
+	 * @return int
+	 */
+	protected function findFileByFileReference($fileReferenceIdentifier)
+	{
+		$tableName = 'sys_file_reference';
+		$clause = 'uid = ' . $fileReferenceIdentifier;
+		#$clause .= BackendUtility::BEenableFields($tableName); // was removed following https://forge.typo3.org/issues/62370
+		$clause .= BackendUtility::deleteClause($tableName);
+		$record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'sys_file_reference', $clause);
+
+		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);
+	}
+
+	/**
+	 * Wrapper around the global database connection object.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 }

Classes/FileUpload/Optimizer/Rotate.php

Doc Comments +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
      * Returns true if the given picture is rotated.
      *
      * @param integer $orientation EXIF orientation
-     * @return integer
+     * @return boolean
      * @see http://www.impulseadventure.com/photo/exif-orientation.html
      */
     protected function isRotated($orientation)

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
             $imParams = '###SkipStripProfile###';
             if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
+                $imParams .= ' '.$transformation;
             }
 
             $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);

Indentation +149 added lines, -149 removed lines

@@ -17,154 +17,154 @@
 class Rotate implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * @return \Fab\Media\FileUpload\Optimizer\Rotate
-     */
-    public function __construct()
-    {
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->init();
-        $this->gifCreator->absPrefix = PATH_site;
-    }
-
-    /**
-     * Optimize the given uploaded image
-     *
-     * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-
-        $orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
-        $isRotated = $this->isRotated($orientation);
-
-        // Only rotate image if necessary!
-        if ($isRotated > 0) {
-            $transformation = $this->getTransformation($orientation);
-
-            $imParams = '###SkipStripProfile###';
-            if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
-            }
-
-            $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
-            if ($tempFileInfo) {
-                // Replace original file
-                @unlink($uploadedFile->getFileWithAbsolutePath());
-                @rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
-
-                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
-                    $this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
-                }
-            }
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Returns the EXIF orientation of a given picture.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    protected function getOrientation($filename)
-    {
-        $extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
-        $orientation = 1; // Fallback to "straight"
-        if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
-            try {
-                $exif = exif_read_data($filename);
-                if ($exif) {
-                    $orientation = $exif['Orientation'];
-                }
-            } catch (\Exception $e) {}
-        }
-        return $orientation;
-    }
-
-    /**
-     * Returns true if the given picture is rotated.
-     *
-     * @param integer $orientation EXIF orientation
-     * @return integer
-     * @see http://www.impulseadventure.com/photo/exif-orientation.html
-     */
-    protected function isRotated($orientation)
-    {
-        $ret = false;
-        switch ($orientation) {
-            case 2: // horizontal flip
-            case 3: // 180°
-            case 4: // vertical flip
-            case 5: // vertical flip + 90 rotate right
-            case 6: // 90° rotate right
-            case 7: // horizontal flip + 90 rotate right
-            case 8: // 90° rotate left
-                $ret = true;
-                break;
-        }
-        return $ret;
-    }
-
-    /**
-     * Returns a command line parameter to fix the orientation of a rotated picture.
-     *
-     * @param integer $orientation
-     * @return string
-     */
-    protected function getTransformation($orientation)
-    {
-        $transformation = '';
-        if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
-            // ImageMagick
-            if ($orientation >= 2 && $orientation <= 8) {
-                $transformation = '-auto-orient';
-            }
-        } else {
-            // GraphicsMagick
-            switch ($orientation) {
-                case 2: // horizontal flip
-                    $transformation = '-flip horizontal';
-                    break;
-                case 3: // 180°
-                    $transformation = '-rotate 180';
-                    break;
-                case 4: // vertical flip
-                    $transformation = '-flip vertical';
-                    break;
-                case 5: // vertical flip + 90 rotate right
-                    $transformation = '-transpose';
-                    break;
-                case 6: // 90° rotate right
-                    $transformation = '-rotate 90';
-                    break;
-                case 7: // horizontal flip + 90 rotate right
-                    $transformation = '-transverse';
-                    break;
-                case 8: // 90° rotate left
-                    $transformation = '-rotate 270';
-                    break;
-            }
-        }
-        return $transformation;
-    }
-
-    /**
-     * Resets the EXIF orientation flag of a picture.
-     *
-     * @param string $filename
-     * @return void
-     * @see http://sylvana.net/jpegcrop/exif_orientation.html
-     */
-    protected function resetOrientation($filename)
-    {
-        JpegExifOrient::setOrientation($filename, 1);
-    }
+	/**
+	 * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
+	 */
+	protected $gifCreator;
+
+	/**
+	 * @return \Fab\Media\FileUpload\Optimizer\Rotate
+	 */
+	public function __construct()
+	{
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->init();
+		$this->gifCreator->absPrefix = PATH_site;
+	}
+
+	/**
+	 * Optimize the given uploaded image
+	 *
+	 * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+
+		$orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
+		$isRotated = $this->isRotated($orientation);
+
+		// Only rotate image if necessary!
+		if ($isRotated > 0) {
+			$transformation = $this->getTransformation($orientation);
+
+			$imParams = '###SkipStripProfile###';
+			if ($transformation !== '') {
+				$imParams .= ' ' . $transformation;
+			}
+
+			$tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
+			if ($tempFileInfo) {
+				// Replace original file
+				@unlink($uploadedFile->getFileWithAbsolutePath());
+				@rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
+
+				if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
+					$this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
+				}
+			}
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Returns the EXIF orientation of a given picture.
+	 *
+	 * @param string $filename
+	 * @return integer
+	 */
+	protected function getOrientation($filename)
+	{
+		$extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
+		$orientation = 1; // Fallback to "straight"
+		if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
+			try {
+				$exif = exif_read_data($filename);
+				if ($exif) {
+					$orientation = $exif['Orientation'];
+				}
+			} catch (\Exception $e) {}
+		}
+		return $orientation;
+	}
+
+	/**
+	 * Returns true if the given picture is rotated.
+	 *
+	 * @param integer $orientation EXIF orientation
+	 * @return integer
+	 * @see http://www.impulseadventure.com/photo/exif-orientation.html
+	 */
+	protected function isRotated($orientation)
+	{
+		$ret = false;
+		switch ($orientation) {
+			case 2: // horizontal flip
+			case 3: // 180°
+			case 4: // vertical flip
+			case 5: // vertical flip + 90 rotate right
+			case 6: // 90° rotate right
+			case 7: // horizontal flip + 90 rotate right
+			case 8: // 90° rotate left
+				$ret = true;
+				break;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Returns a command line parameter to fix the orientation of a rotated picture.
+	 *
+	 * @param integer $orientation
+	 * @return string
+	 */
+	protected function getTransformation($orientation)
+	{
+		$transformation = '';
+		if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
+			// ImageMagick
+			if ($orientation >= 2 && $orientation <= 8) {
+				$transformation = '-auto-orient';
+			}
+		} else {
+			// GraphicsMagick
+			switch ($orientation) {
+				case 2: // horizontal flip
+					$transformation = '-flip horizontal';
+					break;
+				case 3: // 180°
+					$transformation = '-rotate 180';
+					break;
+				case 4: // vertical flip
+					$transformation = '-flip vertical';
+					break;
+				case 5: // vertical flip + 90 rotate right
+					$transformation = '-transpose';
+					break;
+				case 6: // 90° rotate right
+					$transformation = '-rotate 90';
+					break;
+				case 7: // horizontal flip + 90 rotate right
+					$transformation = '-transverse';
+					break;
+				case 8: // 90° rotate left
+					$transformation = '-rotate 270';
+					break;
+			}
+		}
+		return $transformation;
+	}
+
+	/**
+	 * Resets the EXIF orientation flag of a picture.
+	 *
+	 * @param string $filename
+	 * @return void
+	 * @see http://sylvana.net/jpegcrop/exif_orientation.html
+	 */
+	protected function resetOrientation($filename)
+	{
+		JpegExifOrient::setOrientation($filename, 1);
+	}
 
 }

Classes/Grid/UsageRenderer.php

Spacing +1 added lines, -1 removed lines

@@ -193,7 +193,7 @@
             $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow(
                 $labelField,
                 $tableName,
-                'uid = ' . $identifier
+                'uid = '.$identifier
             );
 
             if (!empty($record[$labelField])) {

Indentation +217 added lines, -217 removed lines

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

Classes/Security/FilePermissionsAspect.php

Spacing +3 added lines, -3 removed lines

@@ -46,7 +46,7 @@ 
 
                     // Only add like condition if needed.
                     if ($folder->getStorage()->getRootLevelFolder() !== $folder) {
-                        $matcher->like('identifier', $folder->getIdentifier() . '%', $automaticallyAddWildCard = false);
+                        $matcher->like('identifier', $folder->getIdentifier().'%', $automaticallyAddWildCard = false);
                     }
                 } else {
 
@@ -71,7 +71,7 @@ 
                     $collectedFiles = [];
                     foreach ($fileMounts as $fileMount) {
 
-                        $combinedIdentifier = $fileMount['base'] . ':' . $fileMount['path'];
+                        $combinedIdentifier = $fileMount['base'].':'.$fileMount['path'];
                         $folder = ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($combinedIdentifier);
 
                         $files = $this->getFileUids($folder);
@@ -183,7 +183,7 @@ 
             if ($fileMountRecord['path']) {
                 $constraintsRespectingFileMounts[] = $query->like(
                     'identifier',
-                    $fileMountRecord['path'] . '%'
+                    $fileMountRecord['path'].'%'
                 );
             }
         }

Indentation +213 added lines, -213 removed lines

@@ -26,217 +26,217 @@
 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));
-
-        // Compute the clause.
-        $clause = sprintf('uid IN (%s) %s %s',
-            $fileMountUids,
-            BackendUtility::BEenableFields($tableName),
-            BackendUtility::deleteClause($tableName)
-        );
-
-        // Fetch the records.
-        /** @var array $fileMountRecords */
-        $fileMountRecords = $this->getDatabaseConnection()->exec_SELECTgetRows(
-            'path',
-            $tableName,
-            $clause
-        );
-
-        $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 \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
-
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     * @throws \InvalidArgumentException
-     */
-    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));
+
+		// Compute the clause.
+		$clause = sprintf('uid IN (%s) %s %s',
+			$fileMountUids,
+			BackendUtility::BEenableFields($tableName),
+			BackendUtility::deleteClause($tableName)
+		);
+
+		// Fetch the records.
+		/** @var array $fileMountRecords */
+		$fileMountRecords = $this->getDatabaseConnection()->exec_SELECTgetRows(
+			'path',
+			$tableName,
+			$clause
+		);
+
+		$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 \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
+
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 }

Classes/Index/IndexAnalyser.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     public function searchForMissingFiles(ResourceStorage $storage)
     {
 
-        $query = $this->getDatabaseConnection()->SELECTquery('*', 'sys_file', 'storage = ' . $storage->getUid());
+        $query = $this->getDatabaseConnection()->SELECTquery('*', 'sys_file', 'storage = '.$storage->getUid());
         $resource = $this->getDatabaseConnection()->sql_query($query);
 
         $missingFiles = [];
@@ -67,7 +67,7 @@ 
                     // 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->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $missingFile->getUid());
+                    $this->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = '.$missingFile->getUid());
                     $deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
                 }
             } catch (\Exception $e) {

Indentation +93 added lines, -93 removed lines

@@ -20,112 +20,112 @@
 class IndexAnalyser implements SingletonInterface
 {
 
-    /**
-     * Return missing file for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     */
-    public function searchForMissingFiles(ResourceStorage $storage)
-    {
+	/**
+	 * Return missing file for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForMissingFiles(ResourceStorage $storage)
+	{
 
-        $query = $this->getDatabaseConnection()->SELECTquery('*', 'sys_file', 'storage = ' . $storage->getUid());
-        $resource = $this->getDatabaseConnection()->sql_query($query);
+		$query = $this->getDatabaseConnection()->SELECTquery('*', 'sys_file', 'storage = ' . $storage->getUid());
+		$resource = $this->getDatabaseConnection()->sql_query($query);
 
-        $missingFiles = [];
-        while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
+		$missingFiles = [];
+		while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
 
-            // This task is very memory consuming on large data set e.g > 20'000 records.
-            // We must think of having a pagination if there is the need for such thing.
-            $file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
-            if (!$file->exists()) {
-                $missingFiles[] = $file;
-            }
-        }
-        return $missingFiles;
-    }
+			// This task is very memory consuming on large data set e.g > 20'000 records.
+			// We must think of having a pagination if there is the need for such thing.
+			$file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
+			if (!$file->exists()) {
+				$missingFiles[] = $file;
+			}
+		}
+		return $missingFiles;
+	}
 
-    /**
-     * Deletes all missing files for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function deleteMissingFiles(ResourceStorage $storage)
-    {
-        /** @var FileReferenceService $fileReferenceService */
-        $fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
-        $missingFiles = $this->searchForMissingFiles($storage);
-        $deletedFiles = [];
+	/**
+	 * Deletes all missing files for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function deleteMissingFiles(ResourceStorage $storage)
+	{
+		/** @var FileReferenceService $fileReferenceService */
+		$fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
+		$missingFiles = $this->searchForMissingFiles($storage);
+		$deletedFiles = [];
 
-        /** @var \TYPO3\CMS\Core\Resource\File $missingFile */
-        foreach ($missingFiles as $missingFile) {
-            try {
-                // if missingFile has no file references
-                if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
-                    // 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->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $missingFile->getUid());
-                    $deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-        return $deletedFiles;
-    }
+		/** @var \TYPO3\CMS\Core\Resource\File $missingFile */
+		foreach ($missingFiles as $missingFile) {
+			try {
+				// if missingFile has no file references
+				if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
+					// 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->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $missingFile->getUid());
+					$deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+		return $deletedFiles;
+	}
 
-    /*
+	/*
      * Return duplicates file records
      *
      * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
      * @return array
      */
-    public function searchForDuplicateIdentifiers(ResourceStorage $storage)
-    {
+	public function searchForDuplicateIdentifiers(ResourceStorage $storage)
+	{
 
-        // Detect duplicate records.
-        $query = "SELECT identifier FROM sys_file WHERE storage = {$storage->getUid()} GROUP BY identifier, storage Having COUNT(*) > 1";
-        $resource = $this->getDatabaseConnection()->sql_query($query);
-        $duplicates = [];
-        while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
-            $clause = sprintf('identifier = "%s" AND storage = %s', $row['identifier'], $storage->getUid());
-            $records = $this->getDatabaseConnection()->exec_SELECTgetRows('*', 'sys_file', $clause);
-            $duplicates[$row['identifier']] = $records;
-        }
-        return $duplicates;
-    }
+		// Detect duplicate records.
+		$query = "SELECT identifier FROM sys_file WHERE storage = {$storage->getUid()} GROUP BY identifier, storage Having COUNT(*) > 1";
+		$resource = $this->getDatabaseConnection()->sql_query($query);
+		$duplicates = [];
+		while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
+			$clause = sprintf('identifier = "%s" AND storage = %s', $row['identifier'], $storage->getUid());
+			$records = $this->getDatabaseConnection()->exec_SELECTgetRows('*', 'sys_file', $clause);
+			$duplicates[$row['identifier']] = $records;
+		}
+		return $duplicates;
+	}
 
-    /**
-     * Return duplicates file records
-     *
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return array
-     */
-    public function searchForDuplicateSha1(ResourceStorage $storage)
-    {
+	/**
+	 * Return duplicates file records
+	 *
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForDuplicateSha1(ResourceStorage $storage)
+	{
 
-        // Detect duplicate records.
-        $query = "SELECT sha1 FROM sys_file WHERE storage = {$storage->getUid()} GROUP BY sha1, storage Having COUNT(*) > 1";
-        $resource = $this->getDatabaseConnection()->sql_query($query);
-        $duplicates = [];
-        while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
-            $clause = sprintf('sha1 = "%s" AND storage = %s', $row['sha1'], $storage->getUid());
-            $records = $this->getDatabaseConnection()->exec_SELECTgetRows('*', 'sys_file', $clause);
-            $duplicates[$row['sha1']] = $records;
-        }
-        return $duplicates;
-    }
+		// Detect duplicate records.
+		$query = "SELECT sha1 FROM sys_file WHERE storage = {$storage->getUid()} GROUP BY sha1, storage Having COUNT(*) > 1";
+		$resource = $this->getDatabaseConnection()->sql_query($query);
+		$duplicates = [];
+		while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
+			$clause = sprintf('sha1 = "%s" AND storage = %s', $row['sha1'], $storage->getUid());
+			$records = $this->getDatabaseConnection()->exec_SELECTgetRows('*', 'sys_file', $clause);
+			$duplicates[$row['sha1']] = $records;
+		}
+		return $duplicates;
+	}
 
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 }