fabarea / media

ext_tables.php

Indentation +143 added lines, -143 removed lines

@@ -3,14 +3,14 @@ 
 
 call_user_func(function () {
 
-    if (TYPO3_MODE === 'BE') {
+	if (TYPO3_MODE === 'BE') {
 
-        $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');
 
-        // Default User TSConfig to be added in any case.
-        TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
+		// Default User TSConfig to be added in any case.
+		TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
 
 		# Enable or disabled the Media File Picker in the BE
 		options.vidi.enableMediaFilePicker = 1
@@ -20,149 +20,149 @@ 
 
 	');
 
-        $moduleFileLanguage = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf';
-        if ($configuration['hide_file_list'] == 1) {
+		$moduleFileLanguage = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf';
+		if ($configuration['hide_file_list'] == 1) {
 
-            $moduleFileLanguage = 'LLL:EXT:media/Resources/Private/Language/locallang_filelist.xlf';
+			$moduleFileLanguage = 'LLL:EXT:media/Resources/Private/Language/locallang_filelist.xlf';
 
-            // Default User TSConfig to be added in any case.
-            TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
+			// Default User TSConfig to be added in any case.
+			TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
 
 			# Hide default File List
 			options.hideModules.file := addToList(FilelistList)
 		');
-        }
-
-        \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-            'Fab.media',
-            'user', // Make media module a submodule of 'user'
-            'm1',
-            'bottom', // Position
-            [
-                'Asset' => 'create, update, download, editStorage',
-                'ImageEditor' => 'show',
-                'LinkCreator' => 'show',
-                'ProcessedFile' => 'create',
-            ],
-            [
-                'access' => 'user,group',
-                'icon' => 'EXT:media/Resources/Public/Icons/Extension.svg',
-                'labels' => 'LLL:EXT:media/Resources/Private/Language/locallang_module.xlf',
-            ]
-        );
-
-        $defaultMainModule = (bool)$configuration['has_folder_tree'] ? 'file' : 'content';
-
-        /** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
-        $moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
-            \Fab\Vidi\Module\ModuleLoader::class,
-            'sys_file'
-        );
-        $moduleLoader->setIcon('EXT:media/Resources/Public/Icons/Extension.svg')
-            ->setModuleLanguageFile($moduleFileLanguage)
-            ->setMainModule($defaultMainModule)
-            ->addJavaScriptFiles([
-                'EXT:media/Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js',
-            ])
-            ->addStyleSheetFiles([
-                'EXT:media/Resources/Public/StyleSheets/media.css',
-                'EXT:media/Resources/Public/StyleSheets/fineuploader.css',
-            ])
-            ->setDocHeaderTopLeftComponents([
-                    \Fab\Media\View\Menu\StorageMenu::class,
-                    \Fab\Media\View\Checkbox\RecursiveCheckbox::class,]
-            )
-            ->setDocHeaderBottomLeftComponents([
-                \Fab\Vidi\View\Button\ClipboardButton::class,
-                \Fab\Media\View\Button\NewFolder::class,
-                \Fab\Media\View\Button\UploadButton::class,
-            ])
-            ->setGridTopComponents([
-                \Fab\Media\View\InlineJavaScript::class,
-                \Fab\Media\View\Warning\ConfigurationWarning::class,
-                \Fab\Media\View\Info\SelectedFolderInfo::class,
-            ])
-            ->setGridBottomComponents([
-                \Fab\Media\View\Plugin\LinkCreatorPlugin::class,
-                \Fab\Media\View\Plugin\ImageEditorPlugin::class,
-                \Fab\Media\View\Plugin\FilePickerPlugin::class,
-            ])
-            ->setGridButtonsComponents([
-                \Fab\Media\View\Button\LinkCreatorButton::class,
-                \Fab\Media\View\Button\ImageEditorButton::class,
-                \Fab\Media\View\Button\FilePickerButton::class,
-                \Fab\Media\View\Button\EditButton::class,
-                \Fab\Media\View\Button\DownloadButton::class,
-                \Fab\Media\View\Button\DeleteButton::class,
-            ])
-            ->setMenuMassActionComponents([
-                \Fab\Vidi\View\MenuItem\ExportXlsMenuItem::class,
-                \Fab\Vidi\View\MenuItem\ExportXmlMenuItem::class,
-                \Fab\Vidi\View\MenuItem\ExportCsvMenuItem::class,
-                \Fab\Vidi\View\MenuItem\DividerMenuItem::class,
-
-                // Media custom View Helper
-                \Fab\Vidi\View\MenuItem\ClipboardMenuItem::class,
-                \Fab\Media\View\MenuItem\FilePickerMenuItem::class,
-                \Fab\Media\View\MenuItem\ChangeStorageMenuItem::class,
-                \Fab\Vidi\View\MenuItem\MassDeleteMenuItem::class,
-            ])
-            ->register();
-
-        /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
-        $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
-
-        /** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
-        $signalSlotDispatcher = $objectManager->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
-
-        # Register some tool for Media.
-        \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\ThumbnailGeneratorTool::class);
-        \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\CacheWarmUpTool::class);
-        \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\MissingFilesFinderTool::class);
-        \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\DuplicateRecordsFinderTool::class);
-        \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\DuplicateFilesFinderTool::class);
-
-        // Connect some signals with slots.
-        $signalSlotDispatcher->connect(
-            'Fab\Vidi\Controller\Backend\ContentController', // Small exception in naming here as the class was previously located in "Controller\Backend".
-            'postProcessMatcherObject',
-            \Fab\Media\Security\FilePermissionsAspect::class,
-            'addFilePermissionsForFileStorages'
-        );
-
-        $signalSlotDispatcher->connect(
-            \Fab\Vidi\Domain\Repository\ContentRepository::class,
-            'postProcessConstraintsObject',
-            \Fab\Media\Security\FilePermissionsAspect::class,
-            'addFilePermissionsForFileMounts'
-        );
-
-        $signalSlotDispatcher->connect(
-            \Fab\Vidi\Service\ContentService::class,
-            'afterFindContentObjects',
-            \Fab\Media\Facet\ActionPermissionFacet::class,
-            'modifyResultSet'
-        );
-    }
-
-    // Add new sprite icon.
-    $icons = [
-        'image-edit' => 'EXT:media/Resources/Public/Icons/image_edit.png',
-        'image-link' => 'EXT:media/Resources/Public/Icons/image_link.png',
-        'image-export' => 'EXT:media/Resources/Public/Icons/image_export.png',
-        'storage-change' => 'EXT:media/Resources/Public/Icons/folder_go.png',
-    ];
-    /** @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */
-    $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
-    foreach ($icons as $key => $icon) {
-        $iconRegistry->registerIcon('extensions-media-' . $key,
-            \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-            [
-                'source' => $icon
-            ]
-        );
-    }
-    unset($iconRegistry);
+		}
+
+		\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
+			'Fab.media',
+			'user', // Make media module a submodule of 'user'
+			'm1',
+			'bottom', // Position
+			[
+				'Asset' => 'create, update, download, editStorage',
+				'ImageEditor' => 'show',
+				'LinkCreator' => 'show',
+				'ProcessedFile' => 'create',
+			],
+			[
+				'access' => 'user,group',
+				'icon' => 'EXT:media/Resources/Public/Icons/Extension.svg',
+				'labels' => 'LLL:EXT:media/Resources/Private/Language/locallang_module.xlf',
+			]
+		);
+
+		$defaultMainModule = (bool)$configuration['has_folder_tree'] ? 'file' : 'content';
+
+		/** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
+		$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+			\Fab\Vidi\Module\ModuleLoader::class,
+			'sys_file'
+		);
+		$moduleLoader->setIcon('EXT:media/Resources/Public/Icons/Extension.svg')
+			->setModuleLanguageFile($moduleFileLanguage)
+			->setMainModule($defaultMainModule)
+			->addJavaScriptFiles([
+				'EXT:media/Resources/Public/Libraries/Fineuploader/jquery.fineuploader-5.0.9.min.js',
+			])
+			->addStyleSheetFiles([
+				'EXT:media/Resources/Public/StyleSheets/media.css',
+				'EXT:media/Resources/Public/StyleSheets/fineuploader.css',
+			])
+			->setDocHeaderTopLeftComponents([
+					\Fab\Media\View\Menu\StorageMenu::class,
+					\Fab\Media\View\Checkbox\RecursiveCheckbox::class,]
+			)
+			->setDocHeaderBottomLeftComponents([
+				\Fab\Vidi\View\Button\ClipboardButton::class,
+				\Fab\Media\View\Button\NewFolder::class,
+				\Fab\Media\View\Button\UploadButton::class,
+			])
+			->setGridTopComponents([
+				\Fab\Media\View\InlineJavaScript::class,
+				\Fab\Media\View\Warning\ConfigurationWarning::class,
+				\Fab\Media\View\Info\SelectedFolderInfo::class,
+			])
+			->setGridBottomComponents([
+				\Fab\Media\View\Plugin\LinkCreatorPlugin::class,
+				\Fab\Media\View\Plugin\ImageEditorPlugin::class,
+				\Fab\Media\View\Plugin\FilePickerPlugin::class,
+			])
+			->setGridButtonsComponents([
+				\Fab\Media\View\Button\LinkCreatorButton::class,
+				\Fab\Media\View\Button\ImageEditorButton::class,
+				\Fab\Media\View\Button\FilePickerButton::class,
+				\Fab\Media\View\Button\EditButton::class,
+				\Fab\Media\View\Button\DownloadButton::class,
+				\Fab\Media\View\Button\DeleteButton::class,
+			])
+			->setMenuMassActionComponents([
+				\Fab\Vidi\View\MenuItem\ExportXlsMenuItem::class,
+				\Fab\Vidi\View\MenuItem\ExportXmlMenuItem::class,
+				\Fab\Vidi\View\MenuItem\ExportCsvMenuItem::class,
+				\Fab\Vidi\View\MenuItem\DividerMenuItem::class,
+
+				// Media custom View Helper
+				\Fab\Vidi\View\MenuItem\ClipboardMenuItem::class,
+				\Fab\Media\View\MenuItem\FilePickerMenuItem::class,
+				\Fab\Media\View\MenuItem\ChangeStorageMenuItem::class,
+				\Fab\Vidi\View\MenuItem\MassDeleteMenuItem::class,
+			])
+			->register();
+
+		/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
+		$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
+
+		/** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
+		$signalSlotDispatcher = $objectManager->get(\TYPO3\CMS\Extbase\SignalSlot\Dispatcher::class);
+
+		# Register some tool for Media.
+		\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\ThumbnailGeneratorTool::class);
+		\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\CacheWarmUpTool::class);
+		\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\MissingFilesFinderTool::class);
+		\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\DuplicateRecordsFinderTool::class);
+		\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('sys_file', \Fab\Media\Tool\DuplicateFilesFinderTool::class);
+
+		// Connect some signals with slots.
+		$signalSlotDispatcher->connect(
+			'Fab\Vidi\Controller\Backend\ContentController', // Small exception in naming here as the class was previously located in "Controller\Backend".
+			'postProcessMatcherObject',
+			\Fab\Media\Security\FilePermissionsAspect::class,
+			'addFilePermissionsForFileStorages'
+		);
+
+		$signalSlotDispatcher->connect(
+			\Fab\Vidi\Domain\Repository\ContentRepository::class,
+			'postProcessConstraintsObject',
+			\Fab\Media\Security\FilePermissionsAspect::class,
+			'addFilePermissionsForFileMounts'
+		);
+
+		$signalSlotDispatcher->connect(
+			\Fab\Vidi\Service\ContentService::class,
+			'afterFindContentObjects',
+			\Fab\Media\Facet\ActionPermissionFacet::class,
+			'modifyResultSet'
+		);
+	}
+
+	// Add new sprite icon.
+	$icons = [
+		'image-edit' => 'EXT:media/Resources/Public/Icons/image_edit.png',
+		'image-link' => 'EXT:media/Resources/Public/Icons/image_link.png',
+		'image-export' => 'EXT:media/Resources/Public/Icons/image_export.png',
+		'storage-change' => 'EXT:media/Resources/Public/Icons/folder_go.png',
+	];
+	/** @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */
+	$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
+	foreach ($icons as $key => $icon) {
+		$iconRegistry->registerIcon('extensions-media-' . $key,
+			\TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
+			[
+				'source' => $icon
+			]
+		);
+	}
+	unset($iconRegistry);
 
 });
 

Classes/View/Info/SelectedFolderInfo.php

Indentation +48 added lines, -48 removed lines

@@ -21,59 +21,59 @@
 class SelectedFolderInfo extends AbstractComponentView
 {
 
-    /**
-     * @var array
-     */
-    public $notAllowedMountPoints = [];
+	/**
+	 * @var array
+	 */
+	public $notAllowedMountPoints = [];
 
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
 
-        $result = '';
-        if ($this->getMediaModule()->hasFolderTree()) {
+		$result = '';
+		if ($this->getMediaModule()->hasFolderTree()) {
 
-            $folder = $this->getMediaModule()->getCurrentFolder();
-            $result = sprintf('<h1>%s</h1>', $this->getFolderName($folder));
-        }
+			$folder = $this->getMediaModule()->getCurrentFolder();
+			$result = sprintf('<h1>%s</h1>', $this->getFolderName($folder));
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Get main headline based on active folder or storage for backend module
-     *
-     * Folder names are resolved to their special names like done in the tree view.
-     *
-     * @param Folder $folder
-     * @return string
-     */
-    protected function getFolderName(Folder $folder)
-    {
-        $name = $folder->getName();
-        if ($name === '') {
-            // Show storage name on storage root
-            if ($folder->getIdentifier() === '/') {
-                $name = $folder->getStorage()->getName();
-            }
-        } else {
-            $name = key(ListUtility::resolveSpecialFolderNames(
-                array($name => $folder)
-            ));
-        }
-        return $name;
-    }
+	/**
+	 * Get main headline based on active folder or storage for backend module
+	 *
+	 * Folder names are resolved to their special names like done in the tree view.
+	 *
+	 * @param Folder $folder
+	 * @return string
+	 */
+	protected function getFolderName(Folder $folder)
+	{
+		$name = $folder->getName();
+		if ($name === '') {
+			// Show storage name on storage root
+			if ($folder->getIdentifier() === '/') {
+				$name = $folder->getStorage()->getName();
+			}
+		} else {
+			$name = key(ListUtility::resolveSpecialFolderNames(
+				array($name => $folder)
+			));
+		}
+		return $name;
+	}
 
-    /**
-     * @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/View/Checkbox/RecursiveCheckbox.php

Indentation +74 added lines, -74 removed lines

@@ -19,50 +19,50 @@ 
 class RecursiveCheckbox extends AbstractComponentView
 {
 
-    /**
-     * @var \Fab\Vidi\Module\ModuleLoader
-     * @inject
-     */
-    protected $moduleLoader;
-
-    /**
-     * Renders a checkbox for recursive file browsing.
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function render()
-    {
-
-        $output = '';
-        if ($this->isDisplayed()) {
-            $this->loadRequireJsCode();
-            $output = $this->renderRecursiveCheckbox();
-        }
-
-        return $output;
-    }
-
-    /**
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    protected function isDisplayed()
-    {
-        $isDisplayed = $this->getMediaModule()->hasFolderTree();
-        if ($this->getModuleLoader()->hasPlugin()) {
-            $isDisplayed = false;
-        }
-        return $isDisplayed;
-    }
-
-    /**
-     * @return string
-     */
-    protected function renderRecursiveCheckbox()
-    {
-
-        $template = '<form action="%s" id="form-checkbox-hasRecursiveSelection" method="get">
+	/**
+	 * @var \Fab\Vidi\Module\ModuleLoader
+	 * @inject
+	 */
+	protected $moduleLoader;
+
+	/**
+	 * Renders a checkbox for recursive file browsing.
+	 *
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	public function render()
+	{
+
+		$output = '';
+		if ($this->isDisplayed()) {
+			$this->loadRequireJsCode();
+			$output = $this->renderRecursiveCheckbox();
+		}
+
+		return $output;
+	}
+
+	/**
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	protected function isDisplayed()
+	{
+		$isDisplayed = $this->getMediaModule()->hasFolderTree();
+		if ($this->getModuleLoader()->hasPlugin()) {
+			$isDisplayed = false;
+		}
+		return $isDisplayed;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function renderRecursiveCheckbox()
+	{
+
+		$template = '<form action="%s" id="form-checkbox-hasRecursiveSelection" method="get">
 						<label>
 							<input type="checkbox"
 									name="%s[hasRecursiveSelection]"
@@ -73,35 +73,35 @@ 
 						</label>
 					</form>';
 
-        return sprintf(
-            $template,
-            $this->getModuleLoader()->getModuleUrl(),
-            $this->moduleLoader->getParameterPrefix(),
-            $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:browse_subfolders')
-        );
-    }
-
-    /**
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-
-        $configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/BrowseRecursively');
-    }
-
-
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+		return sprintf(
+			$template,
+			$this->getModuleLoader()->getModuleUrl(),
+			$this->moduleLoader->getParameterPrefix(),
+			$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:browse_subfolders')
+		);
+	}
+
+	/**
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+
+		$configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/BrowseRecursively');
+	}
+
+
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/View/Button/EditButton.php

Indentation +67 added lines, -67 removed lines

@@ -22,80 +22,80 @@
 class EditButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a "edit" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        $file = $this->getFileConverter()->convert($object);
-        $metadataProperties = $file->_getMetaData();
+	/**
+	 * Renders a "edit" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		$file = $this->getFileConverter()->convert($object);
+		$metadataProperties = $file->_getMetaData();
 
-        $button = '';
-        if ($file->checkActionPermission('write')) {
-            $button = $this->makeLinkButton()
-                ->setHref($this->getUri($file))
-                ->setDataAttributes([
-                    'uid' => $metadataProperties['uid'],
-                    'toggle' => 'tooltip',
-                ])
-                ->setClasses('btn-edit')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:edit_metadata'))
-                ->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
-                ->render();
-        }
+		$button = '';
+		if ($file->checkActionPermission('write')) {
+			$button = $this->makeLinkButton()
+				->setHref($this->getUri($file))
+				->setDataAttributes([
+					'uid' => $metadataProperties['uid'],
+					'toggle' => 'tooltip',
+				])
+				->setClasses('btn-edit')
+				->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:edit_metadata'))
+				->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
+				->render();
+		}
 
-        return $button;
-    }
+		return $button;
+	}
 
-    /**
-     * @param File $file
-     * @return string
-     */
-    protected function getUri(File $file)
-    {
-        $metadataProperties = $file->_getMetaData();
+	/**
+	 * @param File $file
+	 * @return string
+	 */
+	protected function getUri(File $file)
+	{
+		$metadataProperties = $file->_getMetaData();
 
-        $parameterName = sprintf('edit[sys_file_metadata][%s]', $metadataProperties['uid']);
-        $uri = BackendUtility::getModuleUrl(
-            'record_edit',
-            array(
-                $parameterName => 'edit',
-                'returnUrl' => BackendUtility::getModuleUrl(GeneralUtility::_GP('route'), $this->getAdditionalParameters())
-            )
-        );
-        return $uri;
-    }
+		$parameterName = sprintf('edit[sys_file_metadata][%s]', $metadataProperties['uid']);
+		$uri = BackendUtility::getModuleUrl(
+			'record_edit',
+			array(
+				$parameterName => 'edit',
+				'returnUrl' => BackendUtility::getModuleUrl(GeneralUtility::_GP('route'), $this->getAdditionalParameters())
+			)
+		);
+		return $uri;
+	}
 
-    /**
-     * @return array
-     */
-    protected function getAdditionalParameters()
-    {
-        $additionalParameters = [];
-        if (GeneralUtility::_GP('id')) {
-            $additionalParameters['id'] = urldecode(GeneralUtility::_GP('id'));
-        }
+	/**
+	 * @return array
+	 */
+	protected function getAdditionalParameters()
+	{
+		$additionalParameters = [];
+		if (GeneralUtility::_GP('id')) {
+			$additionalParameters['id'] = urldecode(GeneralUtility::_GP('id'));
+		}
 
-        $vidiParameters = GeneralUtility::_GP(VidiModule::PARAMETER_PREFIX);
-        if (is_array($vidiParameters)) {
-            $whitelistedParameters = array_intersect_key($vidiParameters, ['plugins' => true, 'matches' => true]);
-            if (count($whitelistedParameters) === 2) {
-                $additionalParameters[VidiModule::PARAMETER_PREFIX] = $whitelistedParameters;
-            }
-        }
+		$vidiParameters = GeneralUtility::_GP(VidiModule::PARAMETER_PREFIX);
+		if (is_array($vidiParameters)) {
+			$whitelistedParameters = array_intersect_key($vidiParameters, ['plugins' => true, 'matches' => true]);
+			if (count($whitelistedParameters) === 2) {
+				$additionalParameters[VidiModule::PARAMETER_PREFIX] = $whitelistedParameters;
+			}
+		}
 
-        return $additionalParameters;
-    }
+		return $additionalParameters;
+	}
 
-    /**
-     * @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/View/Button/NewFolder.php

Indentation +96 added lines, -96 removed lines

@@ -21,101 +21,101 @@
 class NewFolder extends AbstractComponentView
 {
 
-    /**
-     * Renders a button to create a new folder.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render($object = null)
-    {
-        $output = '';
-        if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
-
-            $button = $this->makeLinkButton()
-                ->setHref($this->getNewFolderUri())
-                ->setTitle($this->getLabel())
-                ->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
-                ->render();
-
-            $output = '<div style="float: left;">' . $button . '</div>';
-        }
-        return $output;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getLabel()
-    {
-        return $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.new');
-    }
-
-    /**
-     * @return string
-     */
-    protected function getNewFolderUri()
-    {
-        return BackendUtility::getModuleUrl(
-            'file_newfolder',
-            array(
-                'target' => $this->getCombineIdentifier(),
-                'returnUrl' => $this->getReturnUrl(),
-            )
-        );
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getCombineIdentifier()
-    {
-        $folder = $this->getMediaModule()->getCurrentFolder();
-        return $folder->getCombinedIdentifier();
-    }
-
-    /**
-     * @return string
-     */
-    protected function getReturnUrl()
-    {
-        $returnUrl = BackendUtility::getModuleUrl(
-            GeneralUtility::_GP('route'),
-            $this->getAdditionalParameters()
-        );
-        return $returnUrl;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getAdditionalParameters()
-    {
-
-        $additionalParameters = [];
-        if (GeneralUtility::_GP('id')) {
-            $additionalParameters = [
-                'id' => urldecode(GeneralUtility::_GP('id')),
-            ];
-        }
-        return $additionalParameters;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Lang\LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return $GLOBALS['LANG'];
-    }
+	/**
+	 * Renders a button to create a new folder.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render($object = null)
+	{
+		$output = '';
+		if ($this->getMediaModule()->hasFolderTree() && !$this->getModuleLoader()->hasPlugin()) {
+
+			$button = $this->makeLinkButton()
+				->setHref($this->getNewFolderUri())
+				->setTitle($this->getLabel())
+				->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
+				->render();
+
+			$output = '<div style="float: left;">' . $button . '</div>';
+		}
+		return $output;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getLabel()
+	{
+		return $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:cm.new');
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getNewFolderUri()
+	{
+		return BackendUtility::getModuleUrl(
+			'file_newfolder',
+			array(
+				'target' => $this->getCombineIdentifier(),
+				'returnUrl' => $this->getReturnUrl(),
+			)
+		);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getCombineIdentifier()
+	{
+		$folder = $this->getMediaModule()->getCurrentFolder();
+		return $folder->getCombinedIdentifier();
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getReturnUrl()
+	{
+		$returnUrl = BackendUtility::getModuleUrl(
+			GeneralUtility::_GP('route'),
+			$this->getAdditionalParameters()
+		);
+		return $returnUrl;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getAdditionalParameters()
+	{
+
+		$additionalParameters = [];
+		if (GeneralUtility::_GP('id')) {
+			$additionalParameters = [
+				'id' => urldecode(GeneralUtility::_GP('id')),
+			];
+		}
+		return $additionalParameters;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Lang\LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return $GLOBALS['LANG'];
+	}
 
 }

Classes/View/Button/DeleteButton.php

Indentation +63 added lines, -63 removed lines

@@ -19,75 +19,75 @@
 class DeleteButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a "delete" button to be placed in the grid.
-     *
-     * @param \Fab\Vidi\Domain\Model\Content $object
-     * @return string
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function render(Content $object = null)
-    {
+	/**
+	 * Renders a "delete" button to be placed in the grid.
+	 *
+	 * @param \Fab\Vidi\Domain\Model\Content $object
+	 * @return string
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function render(Content $object = null)
+	{
 
-        $button = '';
-        $file = $this->getFileConverter()->convert($object);
+		$button = '';
+		$file = $this->getFileConverter()->convert($object);
 
-        // Only display the delete icon if the file has no reference.
-        if ($this->getFileReferenceService()->countTotalReferences($object->getUid()) === 0 && $file->checkActionPermission('write')) {
+		// Only display the delete icon if the file has no reference.
+		if ($this->getFileReferenceService()->countTotalReferences($object->getUid()) === 0 && $file->checkActionPermission('write')) {
 
-            $button = $this->makeLinkButton()
-                ->setHref($this->getDeleteUri($object))
-                ->setDataAttributes([
-                    'uid' => $object->getUid(),
-                    'toggle' => 'tooltip',
-                    'label' => $file->getProperty('title'),
-                ])
-                ->setClasses('btn-delete')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete'))
-                ->setIcon($this->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL))
-                ->render();
-        }
+			$button = $this->makeLinkButton()
+				->setHref($this->getDeleteUri($object))
+				->setDataAttributes([
+					'uid' => $object->getUid(),
+					'toggle' => 'tooltip',
+					'label' => $file->getProperty('title'),
+				])
+				->setClasses('btn-delete')
+				->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:delete'))
+				->setIcon($this->getIconFactory()->getIcon('actions-edit-delete', Icon::SIZE_SMALL))
+				->render();
+		}
 
-        return $button;
-    }
+		return $button;
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    protected function getDeleteUri(Content $object)
-    {
-        $additionalParameters = array(
-            $this->getModuleLoader()->getParameterPrefix() => array(
-                'controller' => 'Content',
-                'action' => 'delete',
-                'format' => 'json',
-                'matches' => array(
-                    'uid' => $object->getUid(),
-                ),
-            ),
-        );
-        return $this->getModuleLoader()->getModuleUrl($additionalParameters);
-    }
+	/**
+	 * @param Content $object
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getDeleteUri(Content $object)
+	{
+		$additionalParameters = array(
+			$this->getModuleLoader()->getParameterPrefix() => array(
+				'controller' => 'Content',
+				'action' => 'delete',
+				'format' => 'json',
+				'matches' => array(
+					'uid' => $object->getUid(),
+				),
+			),
+		);
+		return $this->getModuleLoader()->getModuleUrl($additionalParameters);
+	}
 
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
 
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 
 }

Classes/View/Button/UploadButton.php

Indentation +11 added lines, -11 removed lines

@@ -18,16 +18,16 @@
 class UploadButton extends AbstractComponentView
 {
 
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
 
-        /** @var $fileUpload \Fab\Media\Form\FileUpload */
-        $fileUpload = GeneralUtility::makeInstance(\Fab\Media\Form\FileUpload::class);
-        return $fileUpload->setPrefix(MediaModule::getParameterPrefix())->render();
-    }
+		/** @var $fileUpload \Fab\Media\Form\FileUpload */
+		$fileUpload = GeneralUtility::makeInstance(\Fab\Media\Form\FileUpload::class);
+		return $fileUpload->setPrefix(MediaModule::getParameterPrefix())->render();
+	}
 }

Classes/View/Menu/StorageMenu.php

Indentation +117 added lines, -117 removed lines

@@ -19,126 +19,126 @@
 class StorageMenu extends AbstractComponentView
 {
 
-    /**
-     * @var \Fab\Vidi\Module\ModuleLoader
-     * @inject
-     */
-    protected $moduleLoader;
-
-    /**
-     * Renders a dropdown menu for storage.
-     *
-     * @return string
-     */
-    public function render()
-    {
-
-        $output = '';
-        if ($this->isDisplayed()) {
-            $this->loadRequireJsCode();
-
-            $output = $this->renderStorageMenu();
-        }
-
-        return $output;
-    }
-
-    /**
-     * @return string
-     */
-    protected function isDisplayed()
-    {
-        $isDisplayed = !$this->getMediaModule()->hasFolderTree() || $this->getModuleLoader()->hasPlugin();
-        return $isDisplayed;
-    }
-
-    /**
-     * @return string
-     */
-    protected function renderStorageMenu()
-    {
-
-        $currentStorage = $this->getMediaModule()->getCurrentStorage();
-
-        /** @var $storage \TYPO3\CMS\Core\Resource\ResourceStorage */
-        $options = '';
-        foreach ($this->getMediaModule()->getAllowedStorages() as $storage) {
-            $selected = '';
-            if ($currentStorage->getUid() == $storage->getUid()) {
-                $selected = 'selected';
-            }
-            $options .= sprintf('<option value="%s" %s>%s %s</option>',
-                $storage->getUid(),
-                $selected,
-                $storage->getName(),
-                $storage->isOnline() ?
-                    '' :
-                    '(' . $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline') . ')'
-            );
-        }
-
-        $parameters = GeneralUtility::_GET();
-        $inputs = '';
-        foreach ($parameters as $parameter => $value) {
-            list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
-            if ($parameter !== $this->moduleLoader->getParameterPrefix() . '[storage]') {
-                $inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
-            }
-        }
-
-        $template = '<form action="%s" id="form-menu-storage" method="get">
+	/**
+	 * @var \Fab\Vidi\Module\ModuleLoader
+	 * @inject
+	 */
+	protected $moduleLoader;
+
+	/**
+	 * Renders a dropdown menu for storage.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+
+		$output = '';
+		if ($this->isDisplayed()) {
+			$this->loadRequireJsCode();
+
+			$output = $this->renderStorageMenu();
+		}
+
+		return $output;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function isDisplayed()
+	{
+		$isDisplayed = !$this->getMediaModule()->hasFolderTree() || $this->getModuleLoader()->hasPlugin();
+		return $isDisplayed;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function renderStorageMenu()
+	{
+
+		$currentStorage = $this->getMediaModule()->getCurrentStorage();
+
+		/** @var $storage \TYPO3\CMS\Core\Resource\ResourceStorage */
+		$options = '';
+		foreach ($this->getMediaModule()->getAllowedStorages() as $storage) {
+			$selected = '';
+			if ($currentStorage->getUid() == $storage->getUid()) {
+				$selected = 'selected';
+			}
+			$options .= sprintf('<option value="%s" %s>%s %s</option>',
+				$storage->getUid(),
+				$selected,
+				$storage->getName(),
+				$storage->isOnline() ?
+					'' :
+					'(' . $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline') . ')'
+			);
+		}
+
+		$parameters = GeneralUtility::_GET();
+		$inputs = '';
+		foreach ($parameters as $parameter => $value) {
+			list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
+			if ($parameter !== $this->moduleLoader->getParameterPrefix() . '[storage]') {
+				$inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
+			}
+		}
+
+		$template = '<form action="%s" id="form-menu-storage" method="get">
 						%s
 						<select name="%s[storage]" class="form-control" style="padding-right: 20px" id="menu-storage" onchange="$(\'#form-menu-storage\').submit()">%s</select>
 					</form>';
 
-        return sprintf(
-            $template,
-            $this->getModuleLoader()->getModuleUrl(),
-            $inputs,
-            $this->moduleLoader->getParameterPrefix(),
-            $options
-        );
-    }
-
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-
-        $configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/EditStorage');
-    }
-
-    /**
-     * Compute parameter and value to be correctly encoded by the browser.
-     *
-     * @param string $parameter
-     * @param mixed $value
-     * @return array
-     */
-    protected function computeParameterAndValue($parameter, $value)
-    {
-
-        if (is_string($value)) {
-            $result = array($parameter, $value);
-        } else {
-            $key = key($value);
-            $value = current($value);
-            $parameter = sprintf('%s[%s]', $parameter, $key);
-            $result = $this->computeParameterAndValue($parameter, $value);
-        }
-        return $result;
-    }
-
-    /**
-     * @return MediaModule|object
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+		return sprintf(
+			$template,
+			$this->getModuleLoader()->getModuleUrl(),
+			$inputs,
+			$this->moduleLoader->getParameterPrefix(),
+			$options
+		);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+
+		$configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/EditStorage');
+	}
+
+	/**
+	 * Compute parameter and value to be correctly encoded by the browser.
+	 *
+	 * @param string $parameter
+	 * @param mixed $value
+	 * @return array
+	 */
+	protected function computeParameterAndValue($parameter, $value)
+	{
+
+		if (is_string($value)) {
+			$result = array($parameter, $value);
+		} else {
+			$key = key($value);
+			$value = current($value);
+			$parameter = sprintf('%s[%s]', $parameter, $key);
+			$result = $this->computeParameterAndValue($parameter, $value);
+		}
+		return $result;
+	}
+
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/Utility/ClientValidation.php

Indentation +23 added lines, -23 removed lines

@@ -16,28 +16,28 @@
 class ClientValidation implements SingletonInterface
 {
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Media\Utility\ClientValidation|object
-     */
-    static public function getInstance()
-    {
-        return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\Utility\ClientValidation::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\ClientValidation|object
+	 */
+	static public function getInstance()
+	{
+		return \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\Fab\Media\Utility\ClientValidation::class);
+	}
 
-    /**
-     * Get the validation class name given a field.
-     *
-     * @param string $fieldName
-     * @return string
-     */
-    public function get($fieldName)
-    {
-        $result = '';
-        if (\Fab\Media\Utility\TcaField::getService()->isRequired($fieldName)) {
-            $result = ' validate[required]';
-        }
-        return $result;
-    }
+	/**
+	 * Get the validation class name given a field.
+	 *
+	 * @param string $fieldName
+	 * @return string
+	 */
+	public function get($fieldName)
+	{
+		$result = '';
+		if (\Fab\Media\Utility\TcaField::getService()->isRequired($fieldName)) {
+			$result = ' validate[required]';
+		}
+		return $result;
+	}
 }