fabarea / media

ext_localconf.php

Indentation +27 added lines, -27 removed lines

@@ -3,39 +3,39 @@
 
 call_user_func(function () {
 
-    $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-        \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
-    )->get('media');
+	$configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+		\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
+	)->get('media');
 
-    $GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeRegistry'][1547054767] = [
-        'nodeName' => 'findUploader',
-        'priority' => 40,
-        'class' => \Fab\Media\Backend\TceForms::class,
-    ];
+	$GLOBALS['TYPO3_CONF_VARS']['SYS']['formEngine']['nodeRegistry'][1547054767] = [
+		'nodeName' => 'findUploader',
+		'priority' => 40,
+		'class' => \Fab\Media\Backend\TceForms::class,
+	];
 
-    $disableTitleMetadataExtractor = isset($configuration['disable_title_metadata_extractor']) ? $configuration['disable_title_metadata_extractor'] : FALSE;
-    if (!$disableTitleMetadataExtractor) {
+	$disableTitleMetadataExtractor = isset($configuration['disable_title_metadata_extractor']) ? $configuration['disable_title_metadata_extractor'] : FALSE;
+	if (!$disableTitleMetadataExtractor) {
 
-        // Register basic metadata extractor. Will feed the file with a "title" when indexing, e.g. upload, through scheduler
-        \TYPO3\CMS\Core\Resource\Index\ExtractorRegistry::getInstance()->registerExtractionService(\Fab\Media\Index\TitleMetadataExtractor::class );
-    }
+		// Register basic metadata extractor. Will feed the file with a "title" when indexing, e.g. upload, through scheduler
+		\TYPO3\CMS\Core\Resource\Index\ExtractorRegistry::getInstance()->registerExtractionService(\Fab\Media\Index\TitleMetadataExtractor::class );
+	}
 
-    // Hook for traditional file upload, trigger metadata indexing as well.
-    // Could be done at the Core level in the future...
-    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_extfilefunc.php']['processData'][] = 'Fab\Media\Hook\FileUploadHook';
+	// Hook for traditional file upload, trigger metadata indexing as well.
+	// Could be done at the Core level in the future...
+	$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_extfilefunc.php']['processData'][] = 'Fab\Media\Hook\FileUploadHook';
 
-    if (TYPO3_MODE === 'BE') {
+	if (TYPO3_MODE === 'BE') {
 
-        // Special process to fill column "usage" which indicates the total number of file reference including soft references.
-        $GLOBALS ['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'Fab\Media\Hook\DataHandlerHook';
+		// Special process to fill column "usage" which indicates the total number of file reference including soft references.
+		$GLOBALS ['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'Fab\Media\Hook\DataHandlerHook';
 
-        $hasMediaFilePicker = isset($configuration['has_media_file_picker']) ? $configuration['has_media_file_picker'] : FALSE;
-        if ($hasMediaFilePicker) {
+		$hasMediaFilePicker = isset($configuration['has_media_file_picker']) ? $configuration['has_media_file_picker'] : FALSE;
+		if ($hasMediaFilePicker) {
 
-            // Override classes for the Object Manager.
-            $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Backend\Form\FormResultCompiler::class] = array(
-                'className' => \Fab\Media\Override\Backend\Form\FormResultCompiler::class
-            );
-        }
-    }
+			// Override classes for the Object Manager.
+			$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects'][\TYPO3\CMS\Backend\Form\FormResultCompiler::class] = array(
+				'className' => \Fab\Media\Override\Backend\Form\FormResultCompiler::class
+			);
+		}
+	}
 });
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 defined('TYPO3_MODE') or die();
 
-call_user_func(function () {
+call_user_func(function() {
 
     $configuration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
         \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class
@@ -17,7 +17,7 @@ 
     if (!$disableTitleMetadataExtractor) {
 
         // Register basic metadata extractor. Will feed the file with a "title" when indexing, e.g. upload, through scheduler
-        \TYPO3\CMS\Core\Resource\Index\ExtractorRegistry::getInstance()->registerExtractionService(\Fab\Media\Index\TitleMetadataExtractor::class );
+        \TYPO3\CMS\Core\Resource\Index\ExtractorRegistry::getInstance()->registerExtractionService(\Fab\Media\Index\TitleMetadataExtractor::class);
     }
 
     // Hook for traditional file upload, trigger metadata indexing as well.

ext_emconf.php

Indentation +26 added lines, -26 removed lines

@@ -1,30 +1,30 @@
 <?php
 
 $EM_CONF[$_EXTKEY] = [
-    'title' => 'Media management',
-    'description' => 'Media management system for TYPO3 CMS.',
-    'category' => 'module',
-    'author' => 'Fabien Udriot',
-    'author_email' => 'fabien@ecodev.ch',
-    'state' => 'stable',
-    'version' => '5.2.0-dev',
-    'autoload' => [
-        'psr-4' => ['Fab\\Media\\' => 'Classes']
-    ],
-    'constraints' =>
-        [
-            'depends' =>
-                [
-                    'typo3' => '10.4.0-10.4.99',
-                    'vidi' => '4.0.0-0.0.0',
-                ],
-            'conflicts' =>
-                [
-                ],
-            'suggests' =>
-                [
-                    'metadata' => '',
-                    'filemetadata' => '',
-                ],
-        ]
+	'title' => 'Media management',
+	'description' => 'Media management system for TYPO3 CMS.',
+	'category' => 'module',
+	'author' => 'Fabien Udriot',
+	'author_email' => 'fabien@ecodev.ch',
+	'state' => 'stable',
+	'version' => '5.2.0-dev',
+	'autoload' => [
+		'psr-4' => ['Fab\\Media\\' => 'Classes']
+	],
+	'constraints' =>
+		[
+			'depends' =>
+				[
+					'typo3' => '10.4.0-10.4.99',
+					'vidi' => '4.0.0-0.0.0',
+				],
+			'conflicts' =>
+				[
+				],
+			'suggests' =>
+				[
+					'metadata' => '',
+					'filemetadata' => '',
+				],
+		]
 ];

Classes/Backend/TceForms.php

Indentation +32 added lines, -32 removed lines

@@ -20,37 +20,37 @@
 class TceForms extends AbstractFormElement
 {
 
-    /**
-     * @return array
-     */
-    public function render()
-    {
-        // Load StyleSheets in the Page Renderer
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $cssFile = ExtensionManagementUtility::extPath('media') . 'Resources/Public/StyleSheets/fineuploader.tce.css';
-        $pageRenderer->addCssFile($cssFile);
-
-        // language labels for JavaScript files
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
-
-        // js files to be loaded
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core') . 'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/JavaScript/Encoder.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
-
-        $result = $this->initializeResultArray();
-
-        $fileMetadataRecord = $this->data['databaseRow'];
-
-        if ($fileMetadataRecord['file'] <= 0) {
-            throw new \Exception('I could not find a valid file identifier', 1392926871);
-        }
-
-        /** @var $fileUpload \Fab\Media\Form\FileUploadTceForms */
-        $fileUpload = GeneralUtility::makeInstance(\Fab\Media\Form\FileUploadTceForms::class);
-        $fileUpload->setValue($fileMetadataRecord['file'][0])->setPrefix(MediaModule::getParameterPrefix());
-        $result['html'] = $fileUpload->render();
-        return $result;
-    }
+	/**
+	 * @return array
+	 */
+	public function render()
+	{
+		// Load StyleSheets in the Page Renderer
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$cssFile = ExtensionManagementUtility::extPath('media') . 'Resources/Public/StyleSheets/fineuploader.tce.css';
+		$pageRenderer->addCssFile($cssFile);
+
+		// language labels for JavaScript files
+		$pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+
+		// js files to be loaded
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core') . 'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/JavaScript/Encoder.js');
+		$pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
+
+		$result = $this->initializeResultArray();
+
+		$fileMetadataRecord = $this->data['databaseRow'];
+
+		if ($fileMetadataRecord['file'] <= 0) {
+			throw new \Exception('I could not find a valid file identifier', 1392926871);
+		}
+
+		/** @var $fileUpload \Fab\Media\Form\FileUploadTceForms */
+		$fileUpload = GeneralUtility::makeInstance(\Fab\Media\Form\FileUploadTceForms::class);
+		$fileUpload->setValue($fileMetadataRecord['file'][0])->setPrefix(MediaModule::getParameterPrefix());
+		$result['html'] = $fileUpload->render();
+		return $result;
+	}
 
 }

Spacing +5 added lines, -5 removed lines

@@ -27,16 +27,16 @@
     {
         // Load StyleSheets in the Page Renderer
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $cssFile = ExtensionManagementUtility::extPath('media') . 'Resources/Public/StyleSheets/fineuploader.tce.css';
+        $cssFile = ExtensionManagementUtility::extPath('media').'Resources/Public/StyleSheets/fineuploader.tce.css';
         $pageRenderer->addCssFile($cssFile);
 
         // language labels for JavaScript files
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media').'Resources/Private/Language/locallang.xlf', 'media_file_upload');
 
         // js files to be loaded
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core') . 'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/JavaScript/Encoder.js');
-        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media') . 'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
+        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('core').'Resources/Public/JavaScript/Contrib/jquery/jquery.min.js');
+        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media').'Resources/Public/JavaScript/Encoder.js');
+        $pageRenderer->addJsFile(ExtensionManagementUtility::extPath('media').'Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js');
 
         $result = $this->initializeResultArray();
 

Classes/Controller/AssetController.php

Indentation +309 added lines, -309 removed lines

@@ -42,314 +42,314 @@
 class AssetController extends ActionController
 {
 
-    /**
-     * @var string
-     */
-    protected $dataType = 'sys_file';
-
-    /**
-     * @throws \Fab\Media\Exception\StorageNotOnlineException
-     * @throws \InvalidArgumentException
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
-     */
-    public function initializeAction()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-
-            /** @var FileConverter $typeConverter */
-            $typeConverter = $this->objectManager->get(FileConverter::class);
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * Force download of the file.
-     *
-     * @param File $file
-     * @param bool $forceDownload
-     * @return bool|string
-     * @throws \RuntimeException
-     */
-    public function downloadAction(File $file, $forceDownload = false)
-    {
-
-        if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
-
-            // Emit signal before downloading the file.
-            $this->emitBeforeDownloadSignal($file);
-
-            // Read the file and dump it with the flag "forceDownload" set to true or false.
-            $file->getStorage()->dumpFileContents($file, $forceDownload);
-
-            $result = true;
-        } else {
-            $result = 'Access denied!';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Handle file upload for a new file.
-     *
-     * @param string $combinedIdentifier
-     * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
-     * @return string
-     */
-    public function createAction($combinedIdentifier)
-    {
-        /** @var UploadedFileInterface $uploadedFile */
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
-        }
-
-        // Get the target folder.
-        if ($this->getMediaModule()->hasFolderTree()) {
-            $targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
-        } else {
-            $storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-            $targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
-        }
-
-        try {
-            $conflictMode = DuplicationBehavior::RENAME;
-            $fileName = $uploadedFile->getName();
-            $file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->extractMetadata($file)
-                ->applyDefaultCategories($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
-    }
-
-    /**
-     * Handle file upload for an existing file.
-     *
-     * @param File $file
-     * @return string
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
-    public function updateAction(File $file)
-    {
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
-        }
-
-        /** @var $file File */
-        $targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
-
-        try {
-            $storage = $file->getStorage();
-            $storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->updateIndex($file)
-                ->extractMetadata($file);
-
-            // Clear cache on pages holding a reference to this file.
-            $this->getCacheService()->clearCache($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-                'fileInfo' => $this->getMetadataViewHelper()->render($file),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
-    }
-
-    /**
-     * Returns an editing form for moving Files between storage.
-     *
-     * @param array $matches
-     * @throws \Exception
-     */
-    public function editStorageAction(array $matches = [])
-    {
-
-        $this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
-        $this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
-
-        $fieldName = 'storage';
-
-        // Instantiate the Matcher object according different rules.
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        $fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
-
-        $this->view->assign('fieldType', ucfirst($fieldType));
-        $this->view->assign('dataType', $this->dataType);
-        $this->view->assign('matches', $matches);
-        $this->view->assign('fieldNameAndPath', $fieldName);
-        $this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
-        $this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
-    }
-
-    /**
-     * Handle file upload.
-     *
-     * @return \Fab\Media\FileUpload\UploadedFileInterface|array
-     * @throws \InvalidArgumentException
-     */
-    protected function handleUpload()
-    {
-
-        /** @var $uploadManager UploadManager */
-        $uploadManager = GeneralUtility::makeInstance(UploadManager::class);
-
-        try {
-            /** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
-            $result = $uploadManager->handleUpload();
-        } catch (\Exception $e) {
-            $result = array('error' => $e->getMessage());
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return MetadataViewHelper
-     * @throws \InvalidArgumentException
-     */
-    protected function getMetadataViewHelper()
-    {
-        return GeneralUtility::makeInstance(MetadataViewHelper::class);
-    }
-
-    /**
-     * @param File $file
-     * @return ThumbnailService
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @throws \InvalidArgumentException
-     */
-    protected function getThumbnailService(File $file)
-    {
-
-        /** @var $thumbnailService ThumbnailService */
-        $thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
-        $thumbnailService->setAppendTimeStamp(true)
-            ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
-        return $thumbnailService;
-    }
-
-    /**
-     * Get the instance of the Indexer service to update the metadata of the file.
-     *
-     * @param int|ResourceStorage $storage
-     * @return MediaIndexer
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaIndexer($storage)
-    {
-        return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
-    }
-
-    /**
-     * @return CacheService
-     * @throws \InvalidArgumentException
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(CacheService::class);
-    }
-
-    /**
-     * Signal that is emitted before a file is downloaded.
-     *
-     * @param File $file
-     * @return void
-     * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException
-     * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException
-     */
-    protected function emitBeforeDownloadSignal(File $file)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher.
-     *
-     * @return Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return $this->objectManager->get(Dispatcher::class);
-    }
-
-    /**
-     * @return ContentService
-     * @throws \InvalidArgumentException
-     */
-    protected function getContentService()
-    {
-        return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
-    }
-
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @var string
+	 */
+	protected $dataType = 'sys_file';
+
+	/**
+	 * @throws \Fab\Media\Exception\StorageNotOnlineException
+	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
+	 */
+	public function initializeAction()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+
+			/** @var FileConverter $typeConverter */
+			$typeConverter = $this->objectManager->get(FileConverter::class);
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * Force download of the file.
+	 *
+	 * @param File $file
+	 * @param bool $forceDownload
+	 * @return bool|string
+	 * @throws \RuntimeException
+	 */
+	public function downloadAction(File $file, $forceDownload = false)
+	{
+
+		if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
+
+			// Emit signal before downloading the file.
+			$this->emitBeforeDownloadSignal($file);
+
+			// Read the file and dump it with the flag "forceDownload" set to true or false.
+			$file->getStorage()->dumpFileContents($file, $forceDownload);
+
+			$result = true;
+		} else {
+			$result = 'Access denied!';
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Handle file upload for a new file.
+	 *
+	 * @param string $combinedIdentifier
+	 * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
+	 * @return string
+	 */
+	public function createAction($combinedIdentifier)
+	{
+		/** @var UploadedFileInterface $uploadedFile */
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
+		}
+
+		// Get the target folder.
+		if ($this->getMediaModule()->hasFolderTree()) {
+			$targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
+		} else {
+			$storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+			$targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
+		}
+
+		try {
+			$conflictMode = DuplicationBehavior::RENAME;
+			$fileName = $uploadedFile->getName();
+			$file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->extractMetadata($file)
+				->applyDefaultCategories($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
+	}
+
+	/**
+	 * Handle file upload for an existing file.
+	 *
+	 * @param File $file
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 * @throws \RuntimeException
+	 */
+	public function updateAction(File $file)
+	{
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES);
+		}
+
+		/** @var $file File */
+		$targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
+
+		try {
+			$storage = $file->getStorage();
+			$storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->updateIndex($file)
+				->extractMetadata($file);
+
+			// Clear cache on pages holding a reference to this file.
+			$this->getCacheService()->clearCache($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+				'fileInfo' => $this->getMetadataViewHelper()->render($file),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return htmlspecialchars(json_encode($response), ENT_NOQUOTES);
+	}
+
+	/**
+	 * Returns an editing form for moving Files between storage.
+	 *
+	 * @param array $matches
+	 * @throws \Exception
+	 */
+	public function editStorageAction(array $matches = [])
+	{
+
+		$this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
+		$this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
+
+		$fieldName = 'storage';
+
+		// Instantiate the Matcher object according different rules.
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		$fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
+
+		$this->view->assign('fieldType', ucfirst($fieldType));
+		$this->view->assign('dataType', $this->dataType);
+		$this->view->assign('matches', $matches);
+		$this->view->assign('fieldNameAndPath', $fieldName);
+		$this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
+		$this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
+	}
+
+	/**
+	 * Handle file upload.
+	 *
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface|array
+	 * @throws \InvalidArgumentException
+	 */
+	protected function handleUpload()
+	{
+
+		/** @var $uploadManager UploadManager */
+		$uploadManager = GeneralUtility::makeInstance(UploadManager::class);
+
+		try {
+			/** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
+			$result = $uploadManager->handleUpload();
+		} catch (\Exception $e) {
+			$result = array('error' => $e->getMessage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return MetadataViewHelper
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMetadataViewHelper()
+	{
+		return GeneralUtility::makeInstance(MetadataViewHelper::class);
+	}
+
+	/**
+	 * @param File $file
+	 * @return ThumbnailService
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getThumbnailService(File $file)
+	{
+
+		/** @var $thumbnailService ThumbnailService */
+		$thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
+		$thumbnailService->setAppendTimeStamp(true)
+			->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
+		return $thumbnailService;
+	}
+
+	/**
+	 * Get the instance of the Indexer service to update the metadata of the file.
+	 *
+	 * @param int|ResourceStorage $storage
+	 * @return MediaIndexer
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaIndexer($storage)
+	{
+		return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
+	}
+
+	/**
+	 * @return CacheService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(CacheService::class);
+	}
+
+	/**
+	 * Signal that is emitted before a file is downloaded.
+	 *
+	 * @param File $file
+	 * @return void
+	 * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotReturnException
+	 * @throws \TYPO3\CMS\Extbase\SignalSlot\Exception\InvalidSlotException
+	 */
+	protected function emitBeforeDownloadSignal(File $file)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher.
+	 *
+	 * @return Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return $this->objectManager->get(Dispatcher::class);
+	}
+
+	/**
+	 * @return ContentService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getContentService()
+	{
+		return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 
 }

Classes/Index/MediaIndexer.php

Indentation +149 added lines, -149 removed lines

@@ -23,154 +23,154 @@
 class MediaIndexer
 {
 
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage = null;
-
-    /**
-     * @param ResourceStorage $storage
-     */
-    public function __construct(ResourceStorage $storage)
-    {
-        $this->storage = $storage;
-    }
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\File $file
-     * @return $this
-     */
-    public function updateIndex(File $file)
-    {
-        $this->getCoreIndexer()->updateIndexEntry($file);
-        return $this;
-    }
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\File $file
-     * @return $this
-     */
-    public function extractMetadata(File $file)
-    {
-
-        $extractionServices = $this->getExtractorRegistry()->getExtractorsWithDriverSupport($this->storage->getDriverType());
-
-        $newMetaData = array(
-            0 => $file->_getMetaData()
-        );
-
-        foreach ($extractionServices as $services) {
-            if (is_array($services)) {
-                foreach ($services as $service) {
-                    if ($service->canProcess($file)) {
-                        $newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
-                    }
-                }
-            } else {
-                $service = $services;
-                // We could optimise here for not repeating this bit
-                if ($service->canProcess($file)) {
-                    $newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
-                }
-            }
-        }
-
-        ksort($newMetaData);
-        $metaData = [];
-        foreach ($newMetaData as $data) {
-            $metaData = array_merge($metaData, $data);
-        }
-        $file->updateProperties($metaData);
-        $this->getMetaDataRepository()->update($file->getUid(), $metaData);
-        $this->getFileIndexRepository()->updateIndexingTime($file->getUid());
-
-        return $this;
-    }
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\File $file
-     * @return $this
-     */
-    public function applyDefaultCategories(File $file)
-    {
-
-        $categoryList = ConfigurationUtility::getInstance()->get('default_categories');
-        $categories = GeneralUtility::trimExplode(',', $categoryList, true);
-
-        foreach ($categories as $category) {
-            $values = array(
-                'uid_local' => $category,
-                'uid_foreign' => $this->getFileMetadataIdentifier($file),
-                'tablenames' => 'sys_file_metadata',
-                'fieldname' => 'categories',
-            );
-            $this->getDataService()->insert('sys_category_record_mm', $values);
-        }
-
-        $metaData['categories'] = count($categories);
-        $file->updateProperties($metaData);
-        $this->getMetaDataRepository()->update($file->getUid(), $metaData);
-        $this->getFileIndexRepository()->updateIndexingTime($file->getUid());
-        return $this;
-    }
-
-    /**
-     * Retrieve the file metadata uid which is different from the file uid.
-     *
-     * @param \TYPO3\CMS\Core\Resource\File $file
-     * @return int
-     */
-    protected function getFileMetadataIdentifier(File $file)
-    {
-        $metadataProperties = $file->_getMetaData();
-        return isset($metadataProperties['_ORIG_uid']) ? (int)$metadataProperties['_ORIG_uid'] : (int)$metadataProperties['uid'];
-    }
-
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return FileIndexRepository
-     */
-    protected function getFileIndexRepository()
-    {
-        return FileIndexRepository::getInstance();
-    }
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return MetaDataRepository
-     */
-    protected function getMetaDataRepository()
-    {
-        return MetaDataRepository::getInstance();
-    }
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return ExtractorRegistry
-     */
-    protected function getExtractorRegistry()
-    {
-        return ExtractorRegistry::getInstance();
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\Resource\Index\Indexer|object
-     */
-    protected function getCoreIndexer()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\Index\Indexer::class, $this->storage);
-    }
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage = null;
+
+	/**
+	 * @param ResourceStorage $storage
+	 */
+	public function __construct(ResourceStorage $storage)
+	{
+		$this->storage = $storage;
+	}
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\File $file
+	 * @return $this
+	 */
+	public function updateIndex(File $file)
+	{
+		$this->getCoreIndexer()->updateIndexEntry($file);
+		return $this;
+	}
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\File $file
+	 * @return $this
+	 */
+	public function extractMetadata(File $file)
+	{
+
+		$extractionServices = $this->getExtractorRegistry()->getExtractorsWithDriverSupport($this->storage->getDriverType());
+
+		$newMetaData = array(
+			0 => $file->_getMetaData()
+		);
+
+		foreach ($extractionServices as $services) {
+			if (is_array($services)) {
+				foreach ($services as $service) {
+					if ($service->canProcess($file)) {
+						$newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
+					}
+				}
+			} else {
+				$service = $services;
+				// We could optimise here for not repeating this bit
+				if ($service->canProcess($file)) {
+					$newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
+				}
+			}
+		}
+
+		ksort($newMetaData);
+		$metaData = [];
+		foreach ($newMetaData as $data) {
+			$metaData = array_merge($metaData, $data);
+		}
+		$file->updateProperties($metaData);
+		$this->getMetaDataRepository()->update($file->getUid(), $metaData);
+		$this->getFileIndexRepository()->updateIndexingTime($file->getUid());
+
+		return $this;
+	}
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\File $file
+	 * @return $this
+	 */
+	public function applyDefaultCategories(File $file)
+	{
+
+		$categoryList = ConfigurationUtility::getInstance()->get('default_categories');
+		$categories = GeneralUtility::trimExplode(',', $categoryList, true);
+
+		foreach ($categories as $category) {
+			$values = array(
+				'uid_local' => $category,
+				'uid_foreign' => $this->getFileMetadataIdentifier($file),
+				'tablenames' => 'sys_file_metadata',
+				'fieldname' => 'categories',
+			);
+			$this->getDataService()->insert('sys_category_record_mm', $values);
+		}
+
+		$metaData['categories'] = count($categories);
+		$file->updateProperties($metaData);
+		$this->getMetaDataRepository()->update($file->getUid(), $metaData);
+		$this->getFileIndexRepository()->updateIndexingTime($file->getUid());
+		return $this;
+	}
+
+	/**
+	 * Retrieve the file metadata uid which is different from the file uid.
+	 *
+	 * @param \TYPO3\CMS\Core\Resource\File $file
+	 * @return int
+	 */
+	protected function getFileMetadataIdentifier(File $file)
+	{
+		$metadataProperties = $file->_getMetaData();
+		return isset($metadataProperties['_ORIG_uid']) ? (int)$metadataProperties['_ORIG_uid'] : (int)$metadataProperties['uid'];
+	}
+
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return FileIndexRepository
+	 */
+	protected function getFileIndexRepository()
+	{
+		return FileIndexRepository::getInstance();
+	}
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return MetaDataRepository
+	 */
+	protected function getMetaDataRepository()
+	{
+		return MetaDataRepository::getInstance();
+	}
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return ExtractorRegistry
+	 */
+	protected function getExtractorRegistry()
+	{
+		return ExtractorRegistry::getInstance();
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\Resource\Index\Indexer|object
+	 */
+	protected function getCoreIndexer()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\Index\Indexer::class, $this->storage);
+	}
 
 }

Classes/FileUpload/Optimizer/Rotate.php

Indentation +148 added lines, -148 removed lines

@@ -18,153 +18,153 @@
 class Rotate implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
-
-    /**
-     * 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;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
+
+	/**
+	 * 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);
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     public function __construct()
     {
         $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+        $this->gifCreator->absPrefix = Environment::getPublicPath().'/';
     }
 
     /**
@@ -50,7 +50,7 @@ 
 
             $imParams = '###SkipStripProfile###';
             if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
+                $imParams .= ' '.$transformation;
             }
 
             $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);

Classes/FileUpload/Optimizer/Resize.php

Indentation +111 added lines, -111 removed lines

@@ -19,116 +19,116 @@
 class Resize implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * @var \TYPO3\CMS\Core\Resource\ResourceStorage
-     */
-    protected $storage;
-
-    /**
-     * Constructor
-     */
-    public function __construct($storage = null)
-    {
-        $this->storage = $storage;
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
-
-    /**
-     * Optimize the given uploaded image.
-     *
-     * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-
-        $imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
-
-        $currentWidth = $imageInfo[0];
-        $currentHeight = $imageInfo[1];
-
-        // resize an image if this one is bigger than telling by the settings.
-        if (is_object($this->storage)) {
-            $storageRecord = $this->storage->getStorageRecord();
-        } else {
-            // Will only work in the BE for now.
-            $storage = $this->getMediaModule()->getCurrentStorage();
-            $storageRecord = $storage->getStorageRecord();
-        }
-
-        if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
-
-            /** @var \Fab\Media\Dimension $imageDimension */
-            $imageDimension = GeneralUtility::makeInstance(\Fab\Media\Dimension::class, $storageRecord['maximum_dimension_original_image']);
-            if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
-
-                // resize taking the width as reference
-                $this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
-            }
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Resize an image according to given parameter.
-     *
-     * @throws \Exception
-     * @param string $fileNameAndPath
-     * @param int $width
-     * @param int $height
-     * @return void
-     */
-    public function resize($fileNameAndPath, $width = 0, $height = 0)
-    {
-
-        // Skip profile of the image
-        $imParams = '###SkipStripProfile###';
-        $options = array(
-            'maxW' => $width,
-            'maxH' => $height,
-        );
-
-        $tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
-        if ($tempFileInfo) {
-
-            // Overwrite original file
-            @unlink($fileNameAndPath);
-            @rename($tempFileInfo[3], $fileNameAndPath);
-        }
-    }
-
-    /**
-     * Escapes a file name so it can safely be used on the command line.
-     *
-     * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
-     * @param string $inputName filename to safeguard, must not be empty
-     * @return string $inputName escaped as needed
-     */
-    protected function wrapFileName($inputName)
-    {
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            $currentLocale = setlocale(LC_CTYPE, 0);
-            setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
-        }
-        $escapedInputName = escapeshellarg($inputName);
-        if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
-            setlocale(LC_CTYPE, $currentLocale);
-        }
-        return $escapedInputName;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+	/**
+	 * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
+	 */
+	protected $gifCreator;
+
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\ResourceStorage
+	 */
+	protected $storage;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct($storage = null)
+	{
+		$this->storage = $storage;
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
+
+	/**
+	 * Optimize the given uploaded image.
+	 *
+	 * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+
+		$imageInfo = getimagesize($uploadedFile->getFileWithAbsolutePath());
+
+		$currentWidth = $imageInfo[0];
+		$currentHeight = $imageInfo[1];
+
+		// resize an image if this one is bigger than telling by the settings.
+		if (is_object($this->storage)) {
+			$storageRecord = $this->storage->getStorageRecord();
+		} else {
+			// Will only work in the BE for now.
+			$storage = $this->getMediaModule()->getCurrentStorage();
+			$storageRecord = $storage->getStorageRecord();
+		}
+
+		if (strlen($storageRecord['maximum_dimension_original_image']) > 0) {
+
+			/** @var \Fab\Media\Dimension $imageDimension */
+			$imageDimension = GeneralUtility::makeInstance(\Fab\Media\Dimension::class, $storageRecord['maximum_dimension_original_image']);
+			if ($currentWidth > $imageDimension->getWidth() || $currentHeight > $imageDimension->getHeight()) {
+
+				// resize taking the width as reference
+				$this->resize($uploadedFile->getFileWithAbsolutePath(), $imageDimension->getWidth(), $imageDimension->getHeight());
+			}
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Resize an image according to given parameter.
+	 *
+	 * @throws \Exception
+	 * @param string $fileNameAndPath
+	 * @param int $width
+	 * @param int $height
+	 * @return void
+	 */
+	public function resize($fileNameAndPath, $width = 0, $height = 0)
+	{
+
+		// Skip profile of the image
+		$imParams = '###SkipStripProfile###';
+		$options = array(
+			'maxW' => $width,
+			'maxH' => $height,
+		);
+
+		$tempFileInfo = $this->gifCreator->imageMagickConvert($fileNameAndPath, '', '', '', $imParams, '', $options, true);
+		if ($tempFileInfo) {
+
+			// Overwrite original file
+			@unlink($fileNameAndPath);
+			@rename($tempFileInfo[3], $fileNameAndPath);
+		}
+	}
+
+	/**
+	 * Escapes a file name so it can safely be used on the command line.
+	 *
+	 * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions
+	 * @param string $inputName filename to safeguard, must not be empty
+	 * @return string $inputName escaped as needed
+	 */
+	protected function wrapFileName($inputName)
+	{
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			$currentLocale = setlocale(LC_CTYPE, 0);
+			setlocale(LC_CTYPE, $GLOBALS['TYPO3_CONF_VARS']['SYS']['systemLocale']);
+		}
+		$escapedInputName = escapeshellarg($inputName);
+		if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['UTF8filesystem']) {
+			setlocale(LC_CTYPE, $currentLocale);
+		}
+		return $escapedInputName;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     {
         $this->storage = $storage;
         $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+        $this->gifCreator->absPrefix = Environment::getPublicPath().'/';
     }
 
     /**