fabarea / media

Classes/Form/FileUpload.php

Indentation +232 added lines, -232 removed lines

@@ -24,30 +24,30 @@ 
 class FileUpload extends AbstractFormField
 {
 
-    /**
-     * @var string
-     */
-    protected $elementId;
-
-    /**
-     * @var \TYPO3\CMS\Core\Resource\File
-     */
-    protected $file;
-
-    /**
-     * @var string
-     */
-    protected $templateFile = 'Resources/Private/Standalone/FileUploadTemplate.html';
-
-    /**
-     * @return \Fab\Media\Form\FileUpload
-     */
-    public function __construct()
-    {
-        $this->addLanguage();
-        $this->elementId = 'jquery-wrapped-fine-uploader-' . uniqid();
-
-        $this->template = <<<EOF
+	/**
+	 * @var string
+	 */
+	protected $elementId;
+
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\File
+	 */
+	protected $file;
+
+	/**
+	 * @var string
+	 */
+	protected $templateFile = 'Resources/Private/Standalone/FileUploadTemplate.html';
+
+	/**
+	 * @return \Fab\Media\Form\FileUpload
+	 */
+	public function __construct()
+	{
+		$this->addLanguage();
+		$this->elementId = 'jquery-wrapped-fine-uploader-' . uniqid();
+
+		$this->template = <<<EOF
 <div class="control-group control-group-upload" style="%s">
     <div class="container-thumbnail">%s</div>
     %s
@@ -59,213 +59,213 @@ 
 </div>
 
 EOF;
-    }
-
-    /**
-     * Add language labels for JavaScript files
-     */
-    protected function addLanguage()
-    {
-        /** @var PageRenderer $pageRenderer */
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
-    }
-
-    /**
-     * Render a file upload field.
-     *
-     * @throws \Fab\Media\Exception\EmptyPropertyException
-     * @return string
-     */
-    public function render()
-    {
-
-        // Instantiate the file object for the whole class if possible.
-        if ($this->getValue()) {
-            $this->file = ResourceFactory::getInstance()->getFileObject($this->getValue());
-        }
-
-        $result = sprintf(
-            $this->template,
-            $this->getInlineStyle(),
-            $this->getThumbnail(),
-            $this->getFileInfo(),
-            $this->elementId,
-            $this->getJavaScriptTemplate(),
-            $this->getJavaScript()
-        );
-        return $result;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getInlineStyle()
-    {
-        $style = 'float: left';
-        if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
-            $style .= '; padding-left: 3px';
-        }
-        return $style;
-    }
-
-    /**
-     * Get the javascript from a file and replace the markers with live variables.
-     *
-     * @return string
-     */
-    protected function getThumbnail()
-    {
-        $thumbnail = '';
-        if ($this->file) {
-
-            /** @var $thumbnailService \Fab\Media\Thumbnail\ThumbnailService */
-            $thumbnailService = GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailService::class, $this->file);
-            $thumbnail = $thumbnailService
-                ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
-                ->setAppendTimeStamp(true)
-                ->create();
-        }
-        return $thumbnail;
-    }
-
-    /**
-     * Get the javascript from a file and replace the markers with live variables.
-     *
-     * @return string
-     */
-    protected function getJavaScriptTemplate()
-    {
-        $view = $this->getStandaloneView();
-        $view->assignMultiple(
-            array(
-                'maximumUploadLabel' => $this->getMaximumUploadLabel(),
-            )
-        );
-        return $view->render();
-    }
-
-    /**
-     * @return \TYPO3\CMS\Fluid\View\StandaloneView
-     */
-    protected function getStandaloneView()
-    {
-        $objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-
-        /** @var \TYPO3\CMS\Fluid\View\StandaloneView $view */
-        $view = $objectManager->get('TYPO3\CMS\Fluid\View\StandaloneView');
-
-        $templatePathAndFilename = ExtensionManagementUtility::extPath('media') . $this->templateFile;
-        $view->setTemplatePathAndFilename($templatePathAndFilename);
-
-        return $view;
-    }
-
-    /**
-     * Get the javascript from a file and replace the markers with live variables.
-     *
-     * @return string
-     */
-    protected function getJavaScript()
-    {
-
-        // Get the base prefix
-        $basePrefix = $this->getBasePrefix($this->getPrefix());
-
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUpload.js';
-
-        return sprintf(
-            file_get_contents($filePath),
-            $basePrefix,
-            $this->elementId,
-            $this->getModuleUrl(),
-            $this->getAllowedExtensions(),
-            GeneralUtility::getMaxUploadFileSize() * 1024,
-            $this->isDrivenByFolder() ?
-                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() :
-                $this->getMediaModule()->getCurrentStorage()->getUid() . ':/'
-
-        );
-    }
-
-    /**
-     * @return bool
-     */
-    protected function isDrivenByFolder()
-    {
-        return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
-    }
-
-    /**
-     * @return string
-     */
-    protected function getModuleUrl()
-    {
-        $moduleSignature = MediaModule::getSignature();
-        return BackendUtility::getModuleUrl($moduleSignature);
-    }
-
-    /**
-     * Returns the max upload file size in Mo.
-     *
-     * @return string
-     */
-    protected function getMaximumUploadLabel()
-    {
-        $result = round(GeneralUtility::getMaxUploadFileSize() / 1024, 2);
-        $label = LocalizationUtility::translate('max_upload_file', 'media');
-        $result = sprintf($label, $result);
-        return $result;
-    }
-
-    /**
-     * Get allowed extension.
-     *
-     * @return string
-     */
-    protected function getAllowedExtensions()
-    {
-        return implode("','", PermissionUtility::getInstance()->getAllowedExtensions());
-    }
-
-    /**
-     * Compute the base prefix by removing the square brackets.
-     *
-     * @param string $prefix
-     * @return string
-     */
-    protected function getBasePrefix($prefix)
-    {
-        $parts = explode('[', $prefix);
-        return empty($parts) ? '' : $parts[0];
-    }
-
-    /**
-     * Returns additional file info.
-     *
-     * @return string
-     */
-    protected function getFileInfo()
-    {
-        return ''; // empty return here but check out Tceforms/FileUpload
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	}
+
+	/**
+	 * Add language labels for JavaScript files
+	 */
+	protected function addLanguage()
+	{
+		/** @var PageRenderer $pageRenderer */
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+	}
+
+	/**
+	 * Render a file upload field.
+	 *
+	 * @throws \Fab\Media\Exception\EmptyPropertyException
+	 * @return string
+	 */
+	public function render()
+	{
+
+		// Instantiate the file object for the whole class if possible.
+		if ($this->getValue()) {
+			$this->file = ResourceFactory::getInstance()->getFileObject($this->getValue());
+		}
+
+		$result = sprintf(
+			$this->template,
+			$this->getInlineStyle(),
+			$this->getThumbnail(),
+			$this->getFileInfo(),
+			$this->elementId,
+			$this->getJavaScriptTemplate(),
+			$this->getJavaScript()
+		);
+		return $result;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getInlineStyle()
+	{
+		$style = 'float: left';
+		if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
+			$style .= '; padding-left: 3px';
+		}
+		return $style;
+	}
+
+	/**
+	 * Get the javascript from a file and replace the markers with live variables.
+	 *
+	 * @return string
+	 */
+	protected function getThumbnail()
+	{
+		$thumbnail = '';
+		if ($this->file) {
+
+			/** @var $thumbnailService \Fab\Media\Thumbnail\ThumbnailService */
+			$thumbnailService = GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailService::class, $this->file);
+			$thumbnail = $thumbnailService
+				->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
+				->setAppendTimeStamp(true)
+				->create();
+		}
+		return $thumbnail;
+	}
+
+	/**
+	 * Get the javascript from a file and replace the markers with live variables.
+	 *
+	 * @return string
+	 */
+	protected function getJavaScriptTemplate()
+	{
+		$view = $this->getStandaloneView();
+		$view->assignMultiple(
+			array(
+				'maximumUploadLabel' => $this->getMaximumUploadLabel(),
+			)
+		);
+		return $view->render();
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Fluid\View\StandaloneView
+	 */
+	protected function getStandaloneView()
+	{
+		$objectManager = GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+
+		/** @var \TYPO3\CMS\Fluid\View\StandaloneView $view */
+		$view = $objectManager->get('TYPO3\CMS\Fluid\View\StandaloneView');
+
+		$templatePathAndFilename = ExtensionManagementUtility::extPath('media') . $this->templateFile;
+		$view->setTemplatePathAndFilename($templatePathAndFilename);
+
+		return $view;
+	}
+
+	/**
+	 * Get the javascript from a file and replace the markers with live variables.
+	 *
+	 * @return string
+	 */
+	protected function getJavaScript()
+	{
+
+		// Get the base prefix
+		$basePrefix = $this->getBasePrefix($this->getPrefix());
+
+		$filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUpload.js';
+
+		return sprintf(
+			file_get_contents($filePath),
+			$basePrefix,
+			$this->elementId,
+			$this->getModuleUrl(),
+			$this->getAllowedExtensions(),
+			GeneralUtility::getMaxUploadFileSize() * 1024,
+			$this->isDrivenByFolder() ?
+				$this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() :
+				$this->getMediaModule()->getCurrentStorage()->getUid() . ':/'
+
+		);
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isDrivenByFolder()
+	{
+		return $this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin();
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getModuleUrl()
+	{
+		$moduleSignature = MediaModule::getSignature();
+		return BackendUtility::getModuleUrl($moduleSignature);
+	}
+
+	/**
+	 * Returns the max upload file size in Mo.
+	 *
+	 * @return string
+	 */
+	protected function getMaximumUploadLabel()
+	{
+		$result = round(GeneralUtility::getMaxUploadFileSize() / 1024, 2);
+		$label = LocalizationUtility::translate('max_upload_file', 'media');
+		$result = sprintf($label, $result);
+		return $result;
+	}
+
+	/**
+	 * Get allowed extension.
+	 *
+	 * @return string
+	 */
+	protected function getAllowedExtensions()
+	{
+		return implode("','", PermissionUtility::getInstance()->getAllowedExtensions());
+	}
+
+	/**
+	 * Compute the base prefix by removing the square brackets.
+	 *
+	 * @param string $prefix
+	 * @return string
+	 */
+	protected function getBasePrefix($prefix)
+	{
+		$parts = explode('[', $prefix);
+		return empty($parts) ? '' : $parts[0];
+	}
+
+	/**
+	 * Returns additional file info.
+	 *
+	 * @return string
+	 */
+	protected function getFileInfo()
+	{
+		return ''; // empty return here but check out Tceforms/FileUpload
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 
 }

Classes/Domain/Validator/StorageValidator.php

Indentation +25 added lines, -25 removed lines

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

Classes/Grid/MetadataRenderer.php

Indentation +64 added lines, -64 removed lines

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

Classes/Grid/PreviewRenderer.php

Indentation +68 added lines, -68 removed lines

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

Classes/Grid/ActionPermissionColumn.php

Indentation +29 added lines, -29 removed lines

@@ -17,34 +17,34 @@
 class ActionPermissionColumn extends ColumnRendererAbstract
 {
 
-    /**
-     * Renders a configurable metadata property of a file in the Grid.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
-
-        $file = $this->getFileConverter()->convert($this->object);
-        $permission = '';
-
-        if ($file->checkActionPermission('read')) {
-            $permission = 'R';
-        }
-        if ($file->checkActionPermission('write')) {
-            $permission .= 'W';
-        }
-
-        return '<strong>' . $permission . '</strong>';
-    }
-
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * Renders a configurable metadata property of a file in the Grid.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
+
+		$file = $this->getFileConverter()->convert($this->object);
+		$permission = '';
+
+		if ($file->checkActionPermission('read')) {
+			$permission = 'R';
+		}
+		if ($file->checkActionPermission('write')) {
+			$permission .= 'W';
+		}
+
+		return '<strong>' . $permission . '</strong>';
+	}
+
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 
 }

Classes/Hook/FileUploadHook.php

Indentation +33 added lines, -33 removed lines

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

Classes/Controller/AssetController.php

Indentation +309 added lines, -309 removed lines

@@ -41,314 +41,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
-     * @validate $combinedIdentifier \Fab\Media\Domain\Validator\StorageValidator
-     * @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
+	 * @validate $combinedIdentifier \Fab\Media\Domain\Validator\StorageValidator
+	 * @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);
+	}
 
 }

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

Configuration/TCA/Overrides/sys_file_metadata.php

Indentation +23 added lines, -23 removed lines

@@ -3,31 +3,31 @@
 
 // We only want to have file relations if extension File advanced metadata is loaded.
 if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('filemetadata')) {
-    $configuration = '--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.relations, related_files';
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('sys_file_metadata', $configuration);
+	$configuration = '--div--;LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:tab.relations, related_files';
+	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addToAllTCAtypes('sys_file_metadata', $configuration);
 }
 
 $tca = [
-    'ctrl' => [
-        'default_sortby' => 'ORDER BY uid DESC',
-        'searchFields' => 'uid,extension,name', // sys_file_metadata.title,sys_file_metadata.keywords,
-    ],
-    'columns' => [
-        'fileinfo' => [
-            'config' => [
-                'type' => 'user',
-                'renderType' => 'findUploader',
-            ],
-        ],
-        'related_files' => [
-            'displayCond' => 'FIELD:sys_language_uid:<=:0',
-            'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_metadata.relations',
-            'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
-                'related_files',
-                [],
-                ''
-            ),
-        ],
-    ],
+	'ctrl' => [
+		'default_sortby' => 'ORDER BY uid DESC',
+		'searchFields' => 'uid,extension,name', // sys_file_metadata.title,sys_file_metadata.keywords,
+	],
+	'columns' => [
+		'fileinfo' => [
+			'config' => [
+				'type' => 'user',
+				'renderType' => 'findUploader',
+			],
+		],
+		'related_files' => [
+			'displayCond' => 'FIELD:sys_language_uid:<=:0',
+			'label' => 'LLL:EXT:media/Resources/Private/Language/locallang_db.xlf:sys_file_metadata.relations',
+			'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig(
+				'related_files',
+				[],
+				''
+			),
+		],
+	],
 ];
 \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($GLOBALS['TCA']['sys_file_metadata'], $tca);
\ No newline at end of file