fabarea / media

Classes/View/Menu/StorageMenu.php

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);
             }
         }

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/Tool/MissingFilesFinderTool.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 

Indentation +124 added lines, -124 removed lines

@@ -22,128 +22,128 @@
  */
 class MissingFilesFinderTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find missing files';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-        // Possible clean up of missing files if the User has clicked so.
-        if (!empty($arguments['deleteMissingFiles'])) {
-            $this->deleteMissingFilesAction($arguments['files']);
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $missingReports = [];
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-            if ($storage->isOnline()) {
-                $missingFiles = $this->getIndexAnalyser()->searchForMissingFiles($storage);
-
-                $missingReports[] = array(
-                    'storage' => $storage,
-                    'missingFiles' => $missingFiles,
-                    'numberOfMissingFiles' => count($missingFiles),
-                );
-            }
-        }
-
-        $view->assign('missingReports', $missingReports);
-
-        return $view->render();
-    }
-
-    /**
-     * Delete files given as parameter.
-     * This is a special case as we have a missing file in the file system
-     * As a result, we can't use $fileObject->delete(); which will
-     * raise exception "Error while fetching permissions".
-     *
-     * @param array $files
-     * @return void
-     */
-    protected function deleteMissingFilesAction(array $files = [])
-    {
-        foreach ($files as $fileUid) {
-            /** @var File $file */
-            try {
-                $file = $this->getResourceFactory()->getFileObject($fileUid);
-                if ($file) {
-                    // The case is special as we have a missing file in the file system
-                    // As a result, we can't use $fileObject->delete(); which will
-                    // raise exception "Error while fetching permissions"
-                    $this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(IndexAnalyser::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find missing files';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+		// Possible clean up of missing files if the User has clicked so.
+		if (!empty($arguments['deleteMissingFiles'])) {
+			$this->deleteMissingFilesAction($arguments['files']);
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/MissingFilesFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$missingReports = [];
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+			if ($storage->isOnline()) {
+				$missingFiles = $this->getIndexAnalyser()->searchForMissingFiles($storage);
+
+				$missingReports[] = array(
+					'storage' => $storage,
+					'missingFiles' => $missingFiles,
+					'numberOfMissingFiles' => count($missingFiles),
+				);
+			}
+		}
+
+		$view->assign('missingReports', $missingReports);
+
+		return $view->render();
+	}
+
+	/**
+	 * Delete files given as parameter.
+	 * This is a special case as we have a missing file in the file system
+	 * As a result, we can't use $fileObject->delete(); which will
+	 * raise exception "Error while fetching permissions".
+	 *
+	 * @param array $files
+	 * @return void
+	 */
+	protected function deleteMissingFilesAction(array $files = [])
+	{
+		foreach ($files as $fileUid) {
+			/** @var File $file */
+			try {
+				$file = $this->getResourceFactory()->getFileObject($fileUid);
+				if ($file) {
+					// The case is special as we have a missing file in the file system
+					// As a result, we can't use $fileObject->delete(); which will
+					// raise exception "Error while fetching permissions"
+					$this->getDataService()->delete('sys_file', ['uid' => $file->getUid()]);
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(IndexAnalyser::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Tool/CacheWarmUpTool.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -75,7 +75,7 @@ 
      */
     protected function getWarmUpSemaphorFile()
     {
-        return Environment::getPublicPath() . '/typo3temp/.media_cache_warmed_up';
+        return Environment::getPublicPath().'/typo3temp/.media_cache_warmed_up';
     }
 
     /**

Indentation +59 added lines, -59 removed lines

@@ -18,70 +18,70 @@
  */
 class CacheWarmUpTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Cache warm up';
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Cache warm up';
+	}
 
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        return $view->render();
-    }
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		return $view->render();
+	}
 
-    /**
-     * Do the job: warm up the cache.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
+	/**
+	 * Do the job: warm up the cache.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/CacheWarmUp/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
 
-        $numberOfEntries = $this->getCacheService()->warmUp();
-        $view->assign('numberOfEntries', $numberOfEntries);
-        touch($this->getWarmUpSemaphorFile());
+		$numberOfEntries = $this->getCacheService()->warmUp();
+		$view->assign('numberOfEntries', $numberOfEntries);
+		touch($this->getWarmUpSemaphorFile());
 
-        return $view->render();
-    }
+		return $view->render();
+	}
 
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 
-    /**
-     * @return string
-     */
-    protected function getWarmUpSemaphorFile()
-    {
-        return Environment::getPublicPath() . '/typo3temp/.media_cache_warmed_up';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getWarmUpSemaphorFile()
+	{
+		return Environment::getPublicPath() . '/typo3temp/.media_cache_warmed_up';
+	}
 
-    /**
-     * @return CacheService|object
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(CacheService::class);
-    }
+	/**
+	 * @return CacheService|object
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(CacheService::class);
+	}
 }

Classes/Tool/DuplicateRecordsFinderTool.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 

Indentation +70 added lines, -70 removed lines

@@ -19,82 +19,82 @@
  */
 class DuplicateRecordsFinderTool extends AbstractTool
 {
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find duplicate Records';
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find duplicate Records';
+	}
 
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
-        return $view->render();
-    }
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', Environment::getPublicPath() . '/');
+		return $view->render();
+	}
 
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateRecordsFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
 
-        $duplicateRecordsReports = [];
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-            if ($storage->isOnline()) {
-                $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
-                $duplicateRecordsReports[] = array(
-                    'storage' => $storage,
-                    'duplicateFiles' => $duplicateFiles,
-                    'numberOfDuplicateFiles' => count($duplicateFiles),
-                );
-            }
-        }
+		$duplicateRecordsReports = [];
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+			if ($storage->isOnline()) {
+				$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
+				$duplicateRecordsReports[] = array(
+					'storage' => $storage,
+					'duplicateFiles' => $duplicateFiles,
+					'numberOfDuplicateFiles' => count($duplicateFiles),
+				);
+			}
+		}
 
-        $view->assign('duplicateRecordsReports', $duplicateRecordsReports);
+		$view->assign('duplicateRecordsReports', $duplicateRecordsReports);
 
-        return $view->render();
-    }
+		return $view->render();
+	}
 
-    /**
-     * Return a pointer to the database.
-     *
-     * @return IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(IndexAnalyser::class);
-    }
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(IndexAnalyser::class);
+	}
 
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(StorageRepository::class);
-    }
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(StorageRepository::class);
+	}
 
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
 }

Classes/FileUpload/UploadManager.php

Spacing +5 added lines, -5 removed lines

@@ -129,8 +129,8 @@ 
         $uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
 
         if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
-            $size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
-            $this->throwException('increase post_max_size and upload_max_filesize to ' . $size);
+            $size = max(1, $this->sizeLimit / 1024 / 1024).'M';
+            $this->throwException('increase post_max_size and upload_max_filesize to '.$size);
         }
     }
 
@@ -198,7 +198,7 @@ 
         $isAllowed = $this->checkFileExtensionPermission($fileName);
         if (!$isAllowed) {
             $these = PermissionUtility::getInstance()->getAllowedExtensionList();
-            $this->throwException('File has an invalid extension, it should be one of ' . $these . '.');
+            $this->throwException('File has an invalid extension, it should be one of '.$these.'.');
         }
     }
 
@@ -256,7 +256,7 @@ 
      */
     public function sanitizeFileName($fileName, $slug = '-', $extra = null)
     {
-        return trim(preg_replace('~[^0-9a-z_' . preg_quote($extra, '~') . ']+~i', $slug, $this->unAccent($fileName)), $slug);
+        return trim(preg_replace('~[^0-9a-z_'.preg_quote($extra, '~').']+~i', $slug, $this->unAccent($fileName)), $slug);
     }
 
     /**
@@ -294,7 +294,7 @@ 
      */
     protected function initializeUploadFolder()
     {
-        $this->uploadFolder = Environment::getPublicPath() . '/' . self::UPLOAD_FOLDER;
+        $this->uploadFolder = Environment::getPublicPath().'/'.self::UPLOAD_FOLDER;
 
         // Initialize the upload folder for file transfer and create it if not yet existing
         if (!file_exists($this->uploadFolder)) {

Indentation +354 added lines, -354 removed lines

@@ -24,358 +24,358 @@
  */
 class UploadManager
 {
-    public const UPLOAD_FOLDER = 'typo3temp/pics';
-
-    /**
-     * @var int|null|string
-     */
-    protected $sizeLimit;
-
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var FormUtility
-     */
-    protected $formUtility;
-
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage;
-
-    /**
-     * Name of the file input in the DOM.
-     *
-     * @var string
-     */
-    protected $inputName = 'qqfile';
-
-    /**
-     * @param ResourceStorage $storage
-     * @return UploadManager
-     */
-    public function __construct($storage = null)
-    {
-        $this->initializeUploadFolder();
-
-        // max file size in bytes
-        $this->sizeLimit = GeneralUtility::getMaxUploadFileSize() * 1024;
-        $this->checkServerSettings();
-
-        $this->formUtility = FormUtility::getInstance();
-        $this->storage = $storage;
-    }
-
-    /**
-     * Handle the uploaded file.
-     *
-     * @return UploadedFileInterface
-     */
-    public function handleUpload()
-    {
-        /** @var $uploadedFile UploadedFileInterface */
-        $uploadedFile = false;
-        if ($this->formUtility->isMultiparted()) {
-            // Default case
-            $uploadedFile = GeneralUtility::makeInstance(MultipartedFile::class);
-        } elseif ($this->formUtility->isOctetStreamed()) {
-            // Fine Upload plugin would use it if forceEncoded = false and paramsInBody = false
-            $uploadedFile = GeneralUtility::makeInstance(StreamedFile::class);
-        } elseif ($this->formUtility->isUrlEncoded()) {
-            // Used for image resizing in BE
-            $uploadedFile = GeneralUtility::makeInstance(Base64File::class);
-        }
-
-        if (!$uploadedFile) {
-            $this->throwException('Could not instantiate an upload object... No file was uploaded?');
-        }
-
-        $fileName = $this->getFileName($uploadedFile);
-
-        $this->checkFileSize($uploadedFile->getSize());
-        $this->checkFileAllowed($fileName);
-
-        $saved = $uploadedFile->setInputName($this->inputName)
-            ->setUploadFolder($this->uploadFolder)
-            ->setName($fileName)
-            ->save();
-
-        if (!$saved) {
-            $this->throwException('Could not save uploaded file. The upload was cancelled, or server error encountered');
-        }
-
-        // Optimize file if the uploaded file is an image.
-        if ($uploadedFile->getType() == File::FILETYPE_IMAGE) {
-            $uploadedFile = ImageOptimizer::getInstance($this->storage)->optimize($uploadedFile);
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Internal function that checks if server's may sizes match the
-     * object's maximum size for uploads.
-     *
-     * @return void
-     */
-    protected function checkServerSettings()
-    {
-        $postSize = $this->toBytes(ini_get('post_max_size'));
-
-        $uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
-
-        if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
-            $size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
-            $this->throwException('increase post_max_size and upload_max_filesize to ' . $size);
-        }
-    }
-
-    /**
-     * Convert a given size with units to bytes.
-     *
-     * @param string $str
-     * @return int|string
-     */
-    protected function toBytes($str)
-    {
-        $val = trim($str);
-        $last = strtolower($str[strlen($str) - 1]);
-        switch ($last) {
-            case 'g':
-                $val *= 1024;
-                // no break
-            case 'm':
-                $val *= 1024;
-                // no break
-            case 'k':
-                $val *= 1024;
-        }
-        return $val;
-    }
-
-    /**
-     * Return a file name given an uploaded file
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @return string
-     */
-    public function getFileName(UploadedFileInterface $uploadedFile)
-    {
-        $pathInfo = pathinfo($uploadedFile->getOriginalName());
-        $fileName = $this->sanitizeFileName($pathInfo['filename']);
-        $fileNameWithExtension = $fileName;
-        if (!empty($pathInfo['extension'])) {
-            $fileNameWithExtension = sprintf('%s.%s', $fileName, $pathInfo['extension']);
-        }
-        return $fileNameWithExtension;
-    }
-
-    /**
-     * Check whether the file size does not exceed the allowed limit
-     *
-     * @param int $size
-     */
-    public function checkFileSize($size)
-    {
-        if ($size == 0) {
-            $this->throwException('File is empty');
-        }
-
-        if ($size > $this->sizeLimit) {
-            $this->throwException('File is too large');
-        }
-    }
-
-    /**
-     * Check whether the file is allowed
-     *
-     * @param string $fileName
-     */
-    public function checkFileAllowed($fileName)
-    {
-        $isAllowed = $this->checkFileExtensionPermission($fileName);
-        if (!$isAllowed) {
-            $these = PermissionUtility::getInstance()->getAllowedExtensionList();
-            $this->throwException('File has an invalid extension, it should be one of ' . $these . '.');
-        }
-    }
-
-    /**
-     * If the fileName is given, check it against the
-     * TYPO3_CONF_VARS[BE][fileDenyPattern] + and if the file extension is allowed
-     *
-     * @see \TYPO3\CMS\Core\Resource\ResourceStorage->checkFileExtensionPermission($fileName);
-     * @param string $fileName Full filename
-     * @return boolean true if extension/filename is allowed
-     */
-    public function checkFileExtensionPermission($fileName)
-    {
-        $isAllowed = GeneralUtility::makeInstance(FileNameValidator::class)->isValid($fileName);
-        if ($isAllowed) {
-            $fileInfo = GeneralUtility::split_fileref($fileName);
-            // Set up the permissions for the file extension
-            $fileExtensionPermissions = $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace'];
-            $fileExtensionPermissions['allow'] = StringUtility::uniqueList(strtolower($fileExtensionPermissions['allow']));
-            $fileExtensionPermissions['deny'] = StringUtility::uniqueList(strtolower($fileExtensionPermissions['deny']));
-            $fileExtension = strtolower($fileInfo['fileext']);
-            if ($fileExtension !== '') {
-                // If the extension is found amongst the allowed types, we return true immediately
-                if ($fileExtensionPermissions['allow'] === '*' || GeneralUtility::inList($fileExtensionPermissions['allow'], $fileExtension)) {
-                    return true;
-                }
-                // If the extension is found amongst the denied types, we return false immediately
-                if ($fileExtensionPermissions['deny'] === '*' || GeneralUtility::inList($fileExtensionPermissions['deny'], $fileExtension)) {
-                    return false;
-                }
-                // If no match we return true
-                return true;
-            } else {
-                if ($fileExtensionPermissions['allow'] === '*') {
-                    return true;
-                }
-                if ($fileExtensionPermissions['deny'] === '*') {
-                    return false;
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Sanitize the file name for the web.
-     * It has been noticed issues when letting done this work by FAL. Give it a little hand.
-     *
-     * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L252
-     * @param string $fileName
-     * @param string $slug
-     * @param string $extra
-     * @return string
-     */
-    public function sanitizeFileName($fileName, $slug = '-', $extra = null)
-    {
-        return trim(preg_replace('~[^0-9a-z_' . preg_quote($extra, '~') . ']+~i', $slug, $this->unAccent($fileName)), $slug);
-    }
-
-    /**
-     * Remove accent from a string
-     *
-     * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L297
-     * @param $string
-     * @return string
-     */
-    protected function unAccent($string)
-    {
-        $searches = array('ç', 'æ', 'œ', 'á', 'é', 'í', 'ó', 'ú', 'à', 'è', 'ì', 'ò', 'ù', 'ä', 'ë', 'ï', 'ö', 'ü', 'ÿ', 'â', 'ê', 'î', 'ô', 'û', 'å', 'e', 'i', 'ø', 'u');
-        $replaces = array('c', 'ae', 'oe', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'y', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u');
-        $sanitizedString = str_replace($searches, $replaces, $string);
-
-        if (extension_loaded('intl') === true) {
-            $sanitizedString = \Normalizer::normalize($sanitizedString, \Normalizer::FORM_KD);
-        }
-        return $sanitizedString;
-    }
-
-    /**
-     * @throws FailedFileUploadException
-     * @param string $message
-     */
-    protected function throwException($message)
-    {
-        throw new FailedFileUploadException($message, 1357510420);
-    }
-
-    /**
-     * Initialize Upload Folder.
-     *
-     * @return void
-     */
-    protected function initializeUploadFolder()
-    {
-        $this->uploadFolder = Environment::getPublicPath() . '/' . self::UPLOAD_FOLDER;
-
-        // Initialize the upload folder for file transfer and create it if not yet existing
-        if (!file_exists($this->uploadFolder)) {
-            GeneralUtility::mkdir($this->uploadFolder);
-        }
-
-        // Check whether the upload folder is writable
-        if (!is_writable($this->uploadFolder)) {
-            $this->throwException("Server error. Upload directory isn't writable.");
-        }
-    }
-
-    /**
-     * @return int|null|string
-     */
-    public function getSizeLimit()
-    {
-        return $this->sizeLimit;
-    }
-
-    /**
-     * @param int|null|string $sizeLimit
-     * @return $this
-     */
-    public function setSizeLimit($sizeLimit)
-    {
-        $this->sizeLimit = $sizeLimit;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUploadFolder()
-    {
-        return $this->uploadFolder;
-    }
-
-    /**
-     * @param string $uploadFolder
-     * @return $this
-     */
-    public function setUploadFolder($uploadFolder)
-    {
-        $this->uploadFolder = $uploadFolder;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getInputName()
-    {
-        return $this->inputName;
-    }
-
-    /**
-     * @param string $inputName
-     * @return $this
-     */
-    public function setInputName($inputName)
-    {
-        $this->inputName = $inputName;
-        return $this;
-    }
-
-    /**
-     * @return ResourceStorage
-     */
-    public function getStorage()
-    {
-        return $this->storage;
-    }
-
-    /**
-     * @param ResourceStorage $storage
-     * @return $this
-     */
-    public function setStorage($storage)
-    {
-        $this->storage = $storage;
-        return $this;
-    }
+	public const UPLOAD_FOLDER = 'typo3temp/pics';
+
+	/**
+	 * @var int|null|string
+	 */
+	protected $sizeLimit;
+
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var FormUtility
+	 */
+	protected $formUtility;
+
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage;
+
+	/**
+	 * Name of the file input in the DOM.
+	 *
+	 * @var string
+	 */
+	protected $inputName = 'qqfile';
+
+	/**
+	 * @param ResourceStorage $storage
+	 * @return UploadManager
+	 */
+	public function __construct($storage = null)
+	{
+		$this->initializeUploadFolder();
+
+		// max file size in bytes
+		$this->sizeLimit = GeneralUtility::getMaxUploadFileSize() * 1024;
+		$this->checkServerSettings();
+
+		$this->formUtility = FormUtility::getInstance();
+		$this->storage = $storage;
+	}
+
+	/**
+	 * Handle the uploaded file.
+	 *
+	 * @return UploadedFileInterface
+	 */
+	public function handleUpload()
+	{
+		/** @var $uploadedFile UploadedFileInterface */
+		$uploadedFile = false;
+		if ($this->formUtility->isMultiparted()) {
+			// Default case
+			$uploadedFile = GeneralUtility::makeInstance(MultipartedFile::class);
+		} elseif ($this->formUtility->isOctetStreamed()) {
+			// Fine Upload plugin would use it if forceEncoded = false and paramsInBody = false
+			$uploadedFile = GeneralUtility::makeInstance(StreamedFile::class);
+		} elseif ($this->formUtility->isUrlEncoded()) {
+			// Used for image resizing in BE
+			$uploadedFile = GeneralUtility::makeInstance(Base64File::class);
+		}
+
+		if (!$uploadedFile) {
+			$this->throwException('Could not instantiate an upload object... No file was uploaded?');
+		}
+
+		$fileName = $this->getFileName($uploadedFile);
+
+		$this->checkFileSize($uploadedFile->getSize());
+		$this->checkFileAllowed($fileName);
+
+		$saved = $uploadedFile->setInputName($this->inputName)
+			->setUploadFolder($this->uploadFolder)
+			->setName($fileName)
+			->save();
+
+		if (!$saved) {
+			$this->throwException('Could not save uploaded file. The upload was cancelled, or server error encountered');
+		}
+
+		// Optimize file if the uploaded file is an image.
+		if ($uploadedFile->getType() == File::FILETYPE_IMAGE) {
+			$uploadedFile = ImageOptimizer::getInstance($this->storage)->optimize($uploadedFile);
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Internal function that checks if server's may sizes match the
+	 * object's maximum size for uploads.
+	 *
+	 * @return void
+	 */
+	protected function checkServerSettings()
+	{
+		$postSize = $this->toBytes(ini_get('post_max_size'));
+
+		$uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
+
+		if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
+			$size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
+			$this->throwException('increase post_max_size and upload_max_filesize to ' . $size);
+		}
+	}
+
+	/**
+	 * Convert a given size with units to bytes.
+	 *
+	 * @param string $str
+	 * @return int|string
+	 */
+	protected function toBytes($str)
+	{
+		$val = trim($str);
+		$last = strtolower($str[strlen($str) - 1]);
+		switch ($last) {
+			case 'g':
+				$val *= 1024;
+				// no break
+			case 'm':
+				$val *= 1024;
+				// no break
+			case 'k':
+				$val *= 1024;
+		}
+		return $val;
+	}
+
+	/**
+	 * Return a file name given an uploaded file
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @return string
+	 */
+	public function getFileName(UploadedFileInterface $uploadedFile)
+	{
+		$pathInfo = pathinfo($uploadedFile->getOriginalName());
+		$fileName = $this->sanitizeFileName($pathInfo['filename']);
+		$fileNameWithExtension = $fileName;
+		if (!empty($pathInfo['extension'])) {
+			$fileNameWithExtension = sprintf('%s.%s', $fileName, $pathInfo['extension']);
+		}
+		return $fileNameWithExtension;
+	}
+
+	/**
+	 * Check whether the file size does not exceed the allowed limit
+	 *
+	 * @param int $size
+	 */
+	public function checkFileSize($size)
+	{
+		if ($size == 0) {
+			$this->throwException('File is empty');
+		}
+
+		if ($size > $this->sizeLimit) {
+			$this->throwException('File is too large');
+		}
+	}
+
+	/**
+	 * Check whether the file is allowed
+	 *
+	 * @param string $fileName
+	 */
+	public function checkFileAllowed($fileName)
+	{
+		$isAllowed = $this->checkFileExtensionPermission($fileName);
+		if (!$isAllowed) {
+			$these = PermissionUtility::getInstance()->getAllowedExtensionList();
+			$this->throwException('File has an invalid extension, it should be one of ' . $these . '.');
+		}
+	}
+
+	/**
+	 * If the fileName is given, check it against the
+	 * TYPO3_CONF_VARS[BE][fileDenyPattern] + and if the file extension is allowed
+	 *
+	 * @see \TYPO3\CMS\Core\Resource\ResourceStorage->checkFileExtensionPermission($fileName);
+	 * @param string $fileName Full filename
+	 * @return boolean true if extension/filename is allowed
+	 */
+	public function checkFileExtensionPermission($fileName)
+	{
+		$isAllowed = GeneralUtility::makeInstance(FileNameValidator::class)->isValid($fileName);
+		if ($isAllowed) {
+			$fileInfo = GeneralUtility::split_fileref($fileName);
+			// Set up the permissions for the file extension
+			$fileExtensionPermissions = $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']['webspace'];
+			$fileExtensionPermissions['allow'] = StringUtility::uniqueList(strtolower($fileExtensionPermissions['allow']));
+			$fileExtensionPermissions['deny'] = StringUtility::uniqueList(strtolower($fileExtensionPermissions['deny']));
+			$fileExtension = strtolower($fileInfo['fileext']);
+			if ($fileExtension !== '') {
+				// If the extension is found amongst the allowed types, we return true immediately
+				if ($fileExtensionPermissions['allow'] === '*' || GeneralUtility::inList($fileExtensionPermissions['allow'], $fileExtension)) {
+					return true;
+				}
+				// If the extension is found amongst the denied types, we return false immediately
+				if ($fileExtensionPermissions['deny'] === '*' || GeneralUtility::inList($fileExtensionPermissions['deny'], $fileExtension)) {
+					return false;
+				}
+				// If no match we return true
+				return true;
+			} else {
+				if ($fileExtensionPermissions['allow'] === '*') {
+					return true;
+				}
+				if ($fileExtensionPermissions['deny'] === '*') {
+					return false;
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Sanitize the file name for the web.
+	 * It has been noticed issues when letting done this work by FAL. Give it a little hand.
+	 *
+	 * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L252
+	 * @param string $fileName
+	 * @param string $slug
+	 * @param string $extra
+	 * @return string
+	 */
+	public function sanitizeFileName($fileName, $slug = '-', $extra = null)
+	{
+		return trim(preg_replace('~[^0-9a-z_' . preg_quote($extra, '~') . ']+~i', $slug, $this->unAccent($fileName)), $slug);
+	}
+
+	/**
+	 * Remove accent from a string
+	 *
+	 * @see https://github.com/alixaxel/phunction/blob/master/phunction/Text.php#L297
+	 * @param $string
+	 * @return string
+	 */
+	protected function unAccent($string)
+	{
+		$searches = array('ç', 'æ', 'œ', 'á', 'é', 'í', 'ó', 'ú', 'à', 'è', 'ì', 'ò', 'ù', 'ä', 'ë', 'ï', 'ö', 'ü', 'ÿ', 'â', 'ê', 'î', 'ô', 'û', 'å', 'e', 'i', 'ø', 'u');
+		$replaces = array('c', 'ae', 'oe', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u', 'y', 'a', 'e', 'i', 'o', 'u', 'a', 'e', 'i', 'o', 'u');
+		$sanitizedString = str_replace($searches, $replaces, $string);
+
+		if (extension_loaded('intl') === true) {
+			$sanitizedString = \Normalizer::normalize($sanitizedString, \Normalizer::FORM_KD);
+		}
+		return $sanitizedString;
+	}
+
+	/**
+	 * @throws FailedFileUploadException
+	 * @param string $message
+	 */
+	protected function throwException($message)
+	{
+		throw new FailedFileUploadException($message, 1357510420);
+	}
+
+	/**
+	 * Initialize Upload Folder.
+	 *
+	 * @return void
+	 */
+	protected function initializeUploadFolder()
+	{
+		$this->uploadFolder = Environment::getPublicPath() . '/' . self::UPLOAD_FOLDER;
+
+		// Initialize the upload folder for file transfer and create it if not yet existing
+		if (!file_exists($this->uploadFolder)) {
+			GeneralUtility::mkdir($this->uploadFolder);
+		}
+
+		// Check whether the upload folder is writable
+		if (!is_writable($this->uploadFolder)) {
+			$this->throwException("Server error. Upload directory isn't writable.");
+		}
+	}
+
+	/**
+	 * @return int|null|string
+	 */
+	public function getSizeLimit()
+	{
+		return $this->sizeLimit;
+	}
+
+	/**
+	 * @param int|null|string $sizeLimit
+	 * @return $this
+	 */
+	public function setSizeLimit($sizeLimit)
+	{
+		$this->sizeLimit = $sizeLimit;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUploadFolder()
+	{
+		return $this->uploadFolder;
+	}
+
+	/**
+	 * @param string $uploadFolder
+	 * @return $this
+	 */
+	public function setUploadFolder($uploadFolder)
+	{
+		$this->uploadFolder = $uploadFolder;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getInputName()
+	{
+		return $this->inputName;
+	}
+
+	/**
+	 * @param string $inputName
+	 * @return $this
+	 */
+	public function setInputName($inputName)
+	{
+		$this->inputName = $inputName;
+		return $this;
+	}
+
+	/**
+	 * @return ResourceStorage
+	 */
+	public function getStorage()
+	{
+		return $this->storage;
+	}
+
+	/**
+	 * @param ResourceStorage $storage
+	 * @return $this
+	 */
+	public function setStorage($storage)
+	{
+		$this->storage = $storage;
+		return $this;
+	}
 }

Classes/FileUpload/UploadedFileAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
      */
     public function getFileWithAbsolutePath()
     {
-        return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
+        return $this->uploadFolder.DIRECTORY_SEPARATOR.$this->name;
     }
 
     /**
@@ -88,8 +88,8 @@ 
      */
     public function getPublicUrl()
     {
-        $fileNameAndPath = str_replace(Environment::getPublicPath() . '/', '', $this->getFileWithAbsolutePath());
-        return '/' . ltrim($fileNameAndPath, '/');
+        $fileNameAndPath = str_replace(Environment::getPublicPath().'/', '', $this->getFileWithAbsolutePath());
+        return '/'.ltrim($fileNameAndPath, '/');
     }
 
     /**

Indentation +137 added lines, -137 removed lines

@@ -18,141 +18,141 @@
  */
 abstract class UploadedFileAbstract implements UploadedFileInterface
 {
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $inputName;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Get the file type.
-     *
-     * @return int
-     */
-    public function getType()
-    {
-        $this->checkFileExistence();
-
-        // this basically extracts the mimetype and guess the filetype based
-        // on the first part of the mimetype works for 99% of all cases, and
-        // we don't need to make an SQL statement like EXT:media does currently
-        $mimeType = $this->getMimeType();
-        list($fileType) = explode('/', $mimeType);
-        switch (strtolower($fileType)) {
-            case 'text':
-                $type = File::FILETYPE_TEXT;
-                break;
-            case 'image':
-                $type = File::FILETYPE_IMAGE;
-                break;
-            case 'audio':
-                $type = File::FILETYPE_AUDIO;
-                break;
-            case 'video':
-                $type = File::FILETYPE_VIDEO;
-                break;
-            case 'application':
-            case 'software':
-                $type = File::FILETYPE_APPLICATION;
-                break;
-            default:
-                $type = File::FILETYPE_UNKNOWN;
-        }
-        return $type;
-    }
-
-    /**
-     * Get the file with its absolute path.
-     *
-     * @return string
-     */
-    public function getFileWithAbsolutePath()
-    {
-        return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
-    }
-
-    /**
-     * Get the file's public URL.
-     *
-     * @return string
-     */
-    public function getPublicUrl()
-    {
-        $fileNameAndPath = str_replace(Environment::getPublicPath() . '/', '', $this->getFileWithAbsolutePath());
-        return '/' . ltrim($fileNameAndPath, '/');
-    }
-
-    /**
-     * @return string
-     */
-    public function getInputName()
-    {
-        return $this->inputName;
-    }
-
-    /**
-     * @param string $inputName
-     * @return UploadedFileInterface
-     */
-    public function setInputName($inputName)
-    {
-        $this->inputName = $inputName;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUploadFolder()
-    {
-        return $this->uploadFolder;
-    }
-
-    /**
-     * @param string $uploadFolder
-     * @return UploadedFileInterface
-     */
-    public function setUploadFolder($uploadFolder)
-    {
-        $this->uploadFolder = $uploadFolder;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     * @return UploadedFileInterface
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * Check whether the file exists.
-     */
-    protected function checkFileExistence()
-    {
-        if (!is_file($this->getFileWithAbsolutePath())) {
-            $message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
-            throw new MissingFileException($message, 1361786958);
-        }
-    }
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $inputName;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Get the file type.
+	 *
+	 * @return int
+	 */
+	public function getType()
+	{
+		$this->checkFileExistence();
+
+		// this basically extracts the mimetype and guess the filetype based
+		// on the first part of the mimetype works for 99% of all cases, and
+		// we don't need to make an SQL statement like EXT:media does currently
+		$mimeType = $this->getMimeType();
+		list($fileType) = explode('/', $mimeType);
+		switch (strtolower($fileType)) {
+			case 'text':
+				$type = File::FILETYPE_TEXT;
+				break;
+			case 'image':
+				$type = File::FILETYPE_IMAGE;
+				break;
+			case 'audio':
+				$type = File::FILETYPE_AUDIO;
+				break;
+			case 'video':
+				$type = File::FILETYPE_VIDEO;
+				break;
+			case 'application':
+			case 'software':
+				$type = File::FILETYPE_APPLICATION;
+				break;
+			default:
+				$type = File::FILETYPE_UNKNOWN;
+		}
+		return $type;
+	}
+
+	/**
+	 * Get the file with its absolute path.
+	 *
+	 * @return string
+	 */
+	public function getFileWithAbsolutePath()
+	{
+		return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
+	}
+
+	/**
+	 * Get the file's public URL.
+	 *
+	 * @return string
+	 */
+	public function getPublicUrl()
+	{
+		$fileNameAndPath = str_replace(Environment::getPublicPath() . '/', '', $this->getFileWithAbsolutePath());
+		return '/' . ltrim($fileNameAndPath, '/');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getInputName()
+	{
+		return $this->inputName;
+	}
+
+	/**
+	 * @param string $inputName
+	 * @return UploadedFileInterface
+	 */
+	public function setInputName($inputName)
+	{
+		$this->inputName = $inputName;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUploadFolder()
+	{
+		return $this->uploadFolder;
+	}
+
+	/**
+	 * @param string $uploadFolder
+	 * @return UploadedFileInterface
+	 */
+	public function setUploadFolder($uploadFolder)
+	{
+		$this->uploadFolder = $uploadFolder;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 * @return UploadedFileInterface
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * Check whether the file exists.
+	 */
+	protected function checkFileExistence()
+	{
+		if (!is_file($this->getFileWithAbsolutePath())) {
+			$message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
+			throw new MissingFileException($message, 1361786958);
+		}
+	}
 }

Classes/Backend/TceForms.php

Spacing +5 added lines, -5 removed lines

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

Indentation +32 added lines, -32 removed lines

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

Classes/View/Plugin/FilePickerPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
         $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
-        $configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
+        $configuration['paths']['Fab/Media'] = $publicResourcesPath.'JavaScript';
 
         $pageRenderer->addRequireJsConfiguration($configuration);
         $pageRenderer->loadRequireJsModule('Fab/Media/PluginFilePicker');

Indentation +23 added lines, -23 removed lines

@@ -19,30 +19,30 @@
  */
 class FilePickerPlugin extends AbstractComponentView
 {
-    /**
-     * Renders a hidden link for file picker.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        if ($this->getModuleLoader()->hasPlugin('filePicker')) {
-            $this->loadRequireJsCode();
-        };
-        return '';
-    }
+	/**
+	 * Renders a hidden link for file picker.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		if ($this->getModuleLoader()->hasPlugin('filePicker')) {
+			$this->loadRequireJsCode();
+		};
+		return '';
+	}
 
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
-        $configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
+		$publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
+		$configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
 
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginFilePicker');
-    }
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginFilePicker');
+	}
 }

Classes/View/Plugin/ImageEditorPlugin.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
         $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
-        $configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
+        $configuration['paths']['Fab/Media'] = $publicResourcesPath.'JavaScript';
 
         $pageRenderer->addRequireJsConfiguration($configuration);
         $pageRenderer->loadRequireJsModule('Fab/Media/PluginImageEditor');

Indentation +42 added lines, -42 removed lines

@@ -21,51 +21,51 @@
  */
 class ImageEditorPlugin extends AbstractComponentView
 {
-    /**
-     * Renders a hidden link for image editor.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
-        if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
-            // Load Require JS code
-            $this->loadRequireJsCode();
+	/**
+	 * Renders a hidden link for image editor.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
+		if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
+			// Load Require JS code
+			$this->loadRequireJsCode();
 
-            $result = sprintf(
-                '<a href="%s" id="btn-imageEditor-current" class="btn btn-imageEditor" style="display: none"></a>',
-                $this->getImageEditorUri()
-            );
-        };
-        return $result;
-    }
+			$result = sprintf(
+				'<a href="%s" id="btn-imageEditor-current" class="btn btn-imageEditor" style="display: none"></a>',
+				$this->getImageEditorUri()
+			);
+		};
+		return $result;
+	}
 
-    /**
-     * @return string
-     */
-    protected function getImageEditorUri()
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => 'ImageEditor',
-                'action' => 'show',
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getImageEditorUri()
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => 'ImageEditor',
+				'action' => 'show',
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return void
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 */
+	protected function loadRequireJsCode()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
 
-        $publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
-        $configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
+		$publicResourcesPath = PathUtility::getPublicResourceWebPath('EXT:media/Resources/Public/');
+		$configuration['paths']['Fab/Media'] = $publicResourcesPath . 'JavaScript';
 
-        $pageRenderer->addRequireJsConfiguration($configuration);
-        $pageRenderer->loadRequireJsModule('Fab/Media/PluginImageEditor');
-    }
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/PluginImageEditor');
+	}
 }