fabarea / media

Classes/View/Button/LinkCreatorButton.php

Indentation +38 added lines, -38 removed lines

@@ -20,43 +20,43 @@
  */
 class LinkCreatorButton extends AbstractComponentView
 {
-    /**
-     * Renders a "link-creator" button to be placed in the grid.
-     *
-     * @param Content $object
-     * @return string
-     */
-    public function render(Content $object = null)
-    {
-        $button = '';
-        if ($this->getModuleLoader()->hasPlugin('linkCreator')) {
-            $button = $this->makeLinkButton()
-                ->setHref($this->getLinkCreatorUri($object))
-                ->setDataAttributes([
-                    'uid' => $object->getUid(),
-                    'toggle' => 'tooltip',
-                ])
-                ->setClasses('btn-linkCreator')
-                ->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:create_link'))
-                ->setIcon($this->getIconFactory()->getIcon('apps-pagetree-page-shortcut-external-root', Icon::SIZE_SMALL))
-                ->render();
-        }
-        return $button;
-    }
+	/**
+	 * Renders a "link-creator" button to be placed in the grid.
+	 *
+	 * @param Content $object
+	 * @return string
+	 */
+	public function render(Content $object = null)
+	{
+		$button = '';
+		if ($this->getModuleLoader()->hasPlugin('linkCreator')) {
+			$button = $this->makeLinkButton()
+				->setHref($this->getLinkCreatorUri($object))
+				->setDataAttributes([
+					'uid' => $object->getUid(),
+					'toggle' => 'tooltip',
+				])
+				->setClasses('btn-linkCreator')
+				->setTitle($this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:create_link'))
+				->setIcon($this->getIconFactory()->getIcon('apps-pagetree-page-shortcut-external-root', Icon::SIZE_SMALL))
+				->render();
+		}
+		return $button;
+	}
 
-    /**
-     * @param Content $object
-     * @return string
-     */
-    protected function getLinkCreatorUri(Content $object)
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'LinkCreator',
-                'action' => 'show',
-                'file' => $object->getUid(),
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @param Content $object
+	 * @return string
+	 */
+	protected function getLinkCreatorUri(Content $object)
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'LinkCreator',
+				'action' => 'show',
+				'file' => $object->getUid(),
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 }

Classes/View/Button/FilePickerButton.php

Indentation +38 added lines, -38 removed lines

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

Classes/View/Button/ImageEditorButton.php

Indentation +38 added lines, -38 removed lines

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

Classes/View/InlineJavaScript.php

Indentation +11 added lines, -11 removed lines

@@ -17,15 +17,15 @@ 
  */
 class InlineJavaScript extends AbstractComponentView
 {
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $parameterPrefix = MediaModule::getParameterPrefix();
-        $output = "
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$parameterPrefix = MediaModule::getParameterPrefix();
+		$output = "
 <script>
 
 window.Media = window.Media || {};
@@ -33,6 +33,6 @@ 
 
 </script>";
 
-        return $output;
-    }
+		return $output;
+	}
 }

Classes/View/Menu/StorageMenu.php

Indentation +109 added lines, -109 removed lines

@@ -19,117 +19,117 @@
  */
 class StorageMenu extends AbstractComponentView
 {
-    /**
-     * 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->getModuleLoader()->getParameterPrefix() . '[storage]') {
-                $inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
-            }
-        }
-
-        $template = '<form action="%s" id="form-menu-storage" method="get">
+	/**
+	 * 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->getModuleLoader()->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->getModuleLoader()->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(MediaModule::class);
-    }
+		return sprintf(
+			$template,
+			$this->getModuleLoader()->getModuleUrl(),
+			$inputs,
+			$this->getModuleLoader()->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(MediaModule::class);
+	}
 }

Classes/View/Checkbox/RecursiveCheckbox.php

Indentation +59 added lines, -59 removed lines

@@ -19,42 +19,42 @@ 
  */
 class RecursiveCheckbox extends AbstractComponentView
 {
-    /**
-     * Renders a checkbox for recursive file browsing.
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function render()
-    {
-        $output = '';
-        if ($this->isDisplayed()) {
-            $this->loadRequireJsCode();
-            $output = $this->renderRecursiveCheckbox();
-        }
+	/**
+	 * 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 $output;
+	}
 
-    /**
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    protected function isDisplayed()
-    {
-        $isDisplayed = $this->getMediaModule()->hasFolderTree();
-        if ($this->getModuleLoader()->hasPlugin()) {
-            $isDisplayed = false;
-        }
-        return $isDisplayed;
-    }
+	/**
+	 * @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">
+	/**
+	 * @return string
+	 */
+	protected function renderRecursiveCheckbox()
+	{
+		$template = '<form action="%s" id="form-checkbox-hasRecursiveSelection" method="get">
 						<label>
 							<input type="checkbox"
 									name="%s[hasRecursiveSelection]"
@@ -65,34 +65,34 @@ 
 						</label>
 					</form>';
 
-        return sprintf(
-            $template,
-            $this->getModuleLoader()->getModuleUrl(),
-            $this->getModuleLoader()->getParameterPrefix(),
-            $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:browse_subfolders')
-        );
-    }
+		return sprintf(
+			$template,
+			$this->getModuleLoader()->getModuleUrl(),
+			$this->getModuleLoader()->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);
+	/**
+	 * @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');
-    }
+		$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(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 }

Classes/View/Info/SelectedFolderInfo.php

Indentation +48 added lines, -48 removed lines

@@ -20,56 +20,56 @@
  */
 class SelectedFolderInfo extends AbstractComponentView
 {
-    /**
-     * @var array
-     */
-    public $notAllowedMountPoints = [];
+	/**
+	 * @var array
+	 */
+	public $notAllowedMountPoints = [];
 
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
-        if ($this->getMediaModule()->hasFolderTree()) {
-            $folder = $this->getMediaModule()->getCurrentFolder();
-            $result = sprintf('<h1>%s</h1>', $this->getFolderName($folder));
-        }
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
+		if ($this->getMediaModule()->hasFolderTree()) {
+			$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(MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 }

Classes/View/Warning/ConfigurationWarning.php

Indentation +322 added lines, -322 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
         $connection->getConnectionForTable($tableName)->update(
             $tableName,
             $values,
-            [ 'uid' => $storage->getUid() ]
+            ['uid' => $storage->getUid()]
         );
     }
 
@@ -115,7 +115,7 @@ 
      */
     protected function getWarmUpSemaphoreFile()
     {
-        return Environment::getPublicPath() . '/typo3temp/.media_cache_warmed_up';
+        return Environment::getPublicPath().'/typo3temp/.media_cache_warmed_up';
     }
 
     /**
@@ -257,7 +257,7 @@ 
         return $queryBuilder
             ->select('*')
             ->from('sys_filemounts')
-            ->where('uid = ' . $identifier)
+            ->where('uid = '.$identifier)
             ->execute()
             ->fetchAssociative();
     }

Classes/View/MenuItem/ChangeStorageMenuItem.php

Indentation +38 added lines, -38 removed lines

@@ -20,44 +20,44 @@
  */
 class ChangeStorageMenuItem extends AbstractComponentView
 {
-    /**
-     * Renders a "change storage" menu item to be placed in the grid menu of Media.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $output = '';
-        if (!$this->getMediaModule()->hasFolderTree()) {
-            $output = sprintf(
-                '<li><a href="%s" class="change-storage" >%s %s</a>',
-                $this->getChangeStorageUri(),
-                $this->getIconFactory()->getIcon('extensions-media-storage-change', Icon::SIZE_SMALL),
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:change_storage')
-            );
-        }
-        return $output;
-    }
+	/**
+	 * Renders a "change storage" menu item to be placed in the grid menu of Media.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$output = '';
+		if (!$this->getMediaModule()->hasFolderTree()) {
+			$output = sprintf(
+				'<li><a href="%s" class="change-storage" >%s %s</a>',
+				$this->getChangeStorageUri(),
+				$this->getIconFactory()->getIcon('extensions-media-storage-change', Icon::SIZE_SMALL),
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:change_storage')
+			);
+		}
+		return $output;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getChangeStorageUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'Asset',
-                'action' => 'editStorage',
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getChangeStorageUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'Asset',
+				'action' => 'editStorage',
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return object|MediaModule
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
+	/**
+	 * @return object|MediaModule
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
 }