fabarea / media

Classes/Controller/ImageEditorController.php

Indentation +32 added lines, -32 removed lines

@@ -21,37 +21,37 @@
 class ImageEditorController extends ActionController
 {
 
-    /**
-     * Initializes the controller before invoking an action method.
-     */
-    public function initializeAction()
-    {
-        /** @var PageRenderer $pageRenderer */
-        $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 \Fab\Media\TypeConverter\FileConverter $typeConverter */
-            $typeConverter = $this->objectManager->get('Fab\Media\TypeConverter\FileConverter');
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * Handle GUI for inserting an image in the RTE.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function showAction(File $file)
-    {
-        $this->view->assign('file', $file);
-        $moduleSignature = MediaModule::getSignature();
-        $this->view->assign('moduleUrl', BackendUtility::getModuleUrl($moduleSignature));
-    }
+	/**
+	 * Initializes the controller before invoking an action method.
+	 */
+	public function initializeAction()
+	{
+		/** @var PageRenderer $pageRenderer */
+		$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 \Fab\Media\TypeConverter\FileConverter $typeConverter */
+			$typeConverter = $this->objectManager->get('Fab\Media\TypeConverter\FileConverter');
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * Handle GUI for inserting an image in the RTE.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function showAction(File $file)
+	{
+		$this->view->assign('file', $file);
+		$moduleSignature = MediaModule::getSignature();
+		$this->view->assign('moduleUrl', BackendUtility::getModuleUrl($moduleSignature));
+	}
 
 }

Classes/View/Checkbox/RecursiveCheckbox.php

Indentation +59 added lines, -59 removed lines

@@ -19,44 +19,44 @@ 
 class RecursiveCheckbox extends AbstractComponentView
 {
 
-    /**
-     * Renders a checkbox for recursive file browsing.
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function render()
-    {
+	/**
+	 * Renders a checkbox for recursive file browsing.
+	 *
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	public function render()
+	{
 
-        $output = '';
-        if ($this->isDisplayed()) {
-            $this->loadRequireJsCode();
-            $output = $this->renderRecursiveCheckbox();
-        }
+		$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()
-    {
+	/**
+	 * @return string
+	 */
+	protected function renderRecursiveCheckbox()
+	{
 
-        $template = '<form action="%s" id="form-checkbox-hasRecursiveSelection" method="get">
+		$template = '<form action="%s" id="form-checkbox-hasRecursiveSelection" method="get">
 						<label>
 							<input type="checkbox"
 									name="%s[hasRecursiveSelection]"
@@ -67,35 +67,35 @@ 
 						</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(\Fab\Media\Module\MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/View/Menu/StorageMenu.php

Indentation +111 added lines, -111 removed lines

@@ -19,120 +19,120 @@
 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(\Fab\Media\Module\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(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Spacing +2 added lines, -3 removed lines

@@ -66,8 +66,7 @@ 
                 $selected,
                 $storage->getName(),
                 $storage->isOnline() ?
-                    '' :
-                    '(' . $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline') . ')'
+                    '' : '('.$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline').')'
             );
         }
 
@@ -75,7 +74,7 @@ 
         $inputs = '';
         foreach ($parameters as $parameter => $value) {
             list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
-            if ($parameter !== $this->getModuleLoader()->getParameterPrefix() . '[storage]') {
+            if ($parameter !== $this->getModuleLoader()->getParameterPrefix().'[storage]') {
                 $inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
             }
         }