fabarea / media

Classes/Tool/CacheWarmUpTool.php

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
      */
     protected function getWarmUpSemaphorFile()
     {
-        return PATH_site . 'typo3temp/.media_cache_warmed_up';
+        return PATH_site.'typo3temp/.media_cache_warmed_up';
     }
 
     /**

Indentation +59 added lines, -59 removed lines

@@ -16,73 +16,73 @@
 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', PATH_site);
-        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', PATH_site);
+		return $view->render();
+	}
 
-    /**
-     * Do the job: warm up the cache.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
+	/**
+	 * 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);
+		$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 PATH_site . 'typo3temp/.media_cache_warmed_up';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getWarmUpSemaphorFile()
+	{
+		return PATH_site . 'typo3temp/.media_cache_warmed_up';
+	}
 
-    /**
-     * @return \Fab\Media\Cache\CacheService|object
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
-    }
+	/**
+	 * @return \Fab\Media\Cache\CacheService|object
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
+	}
 
 }
 

Classes/Tool/MissingFilesFinderTool.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
                     // 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->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $file->getUid());
+                    $this->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = '.$file->getUid());
                 }
             } catch (\Exception $e) {
                 continue;

Indentation +125 added lines, -125 removed lines

@@ -19,131 +19,131 @@
 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', PATH_site);
-        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 \TYPO3\CMS\Core\Resource\File $file */
-            try {
-                $file = ResourceFactory::getInstance()->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->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $file->getUid());
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * 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', PATH_site);
+		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 \TYPO3\CMS\Core\Resource\File $file */
+			try {
+				$file = ResourceFactory::getInstance()->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->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $file->getUid());
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 
 }
 

Classes/Tool/ThumbnailGeneratorTool.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
                         $formattedResultSet[] = sprintf('* File "%s": %s %s',
                             $result['fileUid'],
                             $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+                            empty($result['thumbnailUri']) ? '' : ' -> '.$result['thumbnailUri']
                         );
                     }
 

Indentation +129 added lines, -129 removed lines

@@ -18,135 +18,135 @@
 class ThumbnailGeneratorTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Generate thumbnails';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', PATH_site);
-        return $view->render();
-    }
-
-    /**
-     * Do the job: analyse Index.
-     *
-     * @param array $arguments
-     * @return string
-     */
-    public function work(array $arguments = [])
-    {
-
-        $reports = [];
-
-        $limit = 500; // default value
-        $newOffset = 0;
-
-        // Possible clean up of missing files if the User has clicked so.
-        if (isset($arguments['limit']) && isset($arguments['offset'])) {
-
-            $limit = (int)$arguments['limit'];
-            $offset = (int)$arguments['offset'];
-
-            foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-                if ($storage->isOnline()) {
-
-                    $thumbnailGenerator = $this->getThumbnailGenerator();
-                    $thumbnailGenerator
-                        ->setStorage($storage)
-                        ->generate($limit, $offset);
-
-                    $formattedResultSet = [];
-                    $resultSet = $thumbnailGenerator->getResultSet();
-                    $processedFileIdentifiers = $thumbnailGenerator->getNewProcessedFileIdentifiers();
-
-                    foreach ($processedFileIdentifiers as $fileIdentifier => $processedFileIdentifier) {
-                        $result = $resultSet[$fileIdentifier];
-                        $formattedResultSet[] = sprintf('* File "%s": %s %s',
-                            $result['fileUid'],
-                            $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
-                        );
-                    }
-
-                    $reports[] = array(
-                        'storage' => $storage,
-                        'isStorageOnline' => true,
-                        'resultSet' => $formattedResultSet,
-                        'numberOfProcessedFiles' => $thumbnailGenerator->getNumberOfProcessedFiles(),
-                        'numberOfTraversedFiles' => $thumbnailGenerator->getNumberOfTraversedFiles(),
-                        'numberOfMissingFiles' => $thumbnailGenerator->getNumberOfMissingFiles(),
-                        'totalNumberOfFiles' => $thumbnailGenerator->getTotalNumberOfFiles(),
-                    );
-                } else {
-                    $reports[] = array(
-                        'storage' => $storage,
-                        'isStorageOnline' => false,
-                    );
-                }
-            }
-
-            $newOffset = $limit + $offset;
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $view->assign('limit', $limit);
-        $view->assign('offset', $newOffset);
-        $view->assign('reports', $reports);
-        return $view->render();
-    }
-
-    /**
-     * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
-     */
-    protected function getThumbnailGenerator()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return $this->getBackendUser()->isAdmin();
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Generate thumbnails';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('sitePath', PATH_site);
+		return $view->render();
+	}
+
+	/**
+	 * Do the job: analyse Index.
+	 *
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function work(array $arguments = [])
+	{
+
+		$reports = [];
+
+		$limit = 500; // default value
+		$newOffset = 0;
+
+		// Possible clean up of missing files if the User has clicked so.
+		if (isset($arguments['limit']) && isset($arguments['offset'])) {
+
+			$limit = (int)$arguments['limit'];
+			$offset = (int)$arguments['offset'];
+
+			foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+				if ($storage->isOnline()) {
+
+					$thumbnailGenerator = $this->getThumbnailGenerator();
+					$thumbnailGenerator
+						->setStorage($storage)
+						->generate($limit, $offset);
+
+					$formattedResultSet = [];
+					$resultSet = $thumbnailGenerator->getResultSet();
+					$processedFileIdentifiers = $thumbnailGenerator->getNewProcessedFileIdentifiers();
+
+					foreach ($processedFileIdentifiers as $fileIdentifier => $processedFileIdentifier) {
+						$result = $resultSet[$fileIdentifier];
+						$formattedResultSet[] = sprintf('* File "%s": %s %s',
+							$result['fileUid'],
+							$result['fileIdentifier'],
+							empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+						);
+					}
+
+					$reports[] = array(
+						'storage' => $storage,
+						'isStorageOnline' => true,
+						'resultSet' => $formattedResultSet,
+						'numberOfProcessedFiles' => $thumbnailGenerator->getNumberOfProcessedFiles(),
+						'numberOfTraversedFiles' => $thumbnailGenerator->getNumberOfTraversedFiles(),
+						'numberOfMissingFiles' => $thumbnailGenerator->getNumberOfMissingFiles(),
+						'totalNumberOfFiles' => $thumbnailGenerator->getTotalNumberOfFiles(),
+					);
+				} else {
+					$reports[] = array(
+						'storage' => $storage,
+						'isStorageOnline' => false,
+					);
+				}
+			}
+
+			$newOffset = $limit + $offset;
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$view->assign('limit', $limit);
+		$view->assign('offset', $newOffset);
+		$view->assign('reports', $reports);
+		return $view->render();
+	}
+
+	/**
+	 * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
+	 */
+	protected function getThumbnailGenerator()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return $this->getBackendUser()->isAdmin();
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 
 }
 

Classes/Tool/DuplicateFilesFinderTool.php

Spacing +2 added lines, -2 removed lines

@@ -111,7 +111,7 @@ 
 
                             foreach ($allowedMountPoints as $allowedMountPoint) {
 
-                                $pattern = '%^' . $allowedMountPoint . '%isU';
+                                $pattern = '%^'.$allowedMountPoint.'%isU';
                                 if (preg_match($pattern, $file['identifier'])) {
                                     $filteredFiles[] = $file;
                                     break; // no need to further loop around, stop the loop.
@@ -165,7 +165,7 @@ 
                         $file->delete();
                     }
                 } else {
-                    $this->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $file->getUid());
+                    $this->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = '.$file->getUid());
                 }
             } catch (\Exception $e) {
                 continue;

Indentation +202 added lines, -202 removed lines

@@ -18,208 +18,208 @@
 class DuplicateFilesFinderTool extends AbstractTool
 {
 
-    /**
-     * Display the title of the tool on the welcome screen.
-     *
-     * @return string
-     */
-    public function getTitle()
-    {
-        return 'Find duplicate Files';
-    }
-
-    /**
-     * Display the description of the tool in the welcome screen.
-     *
-     * @return string
-     */
-    public function getDescription()
-    {
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('isAdmin', $this->getBackendUser()->isAdmin());
-        $view->assign('sitePath', PATH_site);
-        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['deleteDuplicateFiles'])) {
-            $this->deleteMissingFilesAction($arguments['files']);
-        }
-
-        $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/WorkResult.html';
-        $view = $this->initializeStandaloneView($templateNameAndPath);
-
-        $duplicateFilesReports = [];
-
-        if ($this->getBackendUser()->isAdmin()) {
-            foreach ($this->getStorageRepository()->findAll() as $storage) {
-                if ($storage->isOnline()) {
-                    $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
-                    $duplicateFilesReports[] = array(
-                        'storage' => $storage,
-                        'duplicateFiles' => $duplicateFiles,
-                        'numberOfDuplicateFiles' => count($duplicateFiles),
-                    );
-                }
-            }
-        } else {
-
-            $fileMounts = $this->getBackendUser()->getFileMountRecords();
-
-            $allowedStorages = [];
-            foreach ($fileMounts as $fileMount) {
-                if ((bool)$fileMount['read_only']) {
-                    continue;
-                }
-
-                if (!isset($allowedStorages[$fileMount['base']])) {
-                    $allowedStorages[$fileMount['base']] = [];
-                }
-                if (!in_array($fileMount['base'], $allowedStorages)) {
-                    $allowedStorages[$fileMount['base']][] = $fileMount['path'];
-                }
-            }
-
-            foreach ($allowedStorages as $storageIdentifier => $allowedMountPoints) {
-                $storage = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
-
-                if ($storage->isOnline()) {
-
-                    $duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
-
-                    // Filter duplicates files
-                    foreach ($duplicateFiles as $key => $files) {
-
-                        $filteredFiles = [];
-                        foreach ($files as $file) {
-
-                            foreach ($allowedMountPoints as $allowedMountPoint) {
-
-                                $pattern = '%^' . $allowedMountPoint . '%isU';
-                                if (preg_match($pattern, $file['identifier'])) {
-                                    $filteredFiles[] = $file;
-                                    break; // no need to further loop around, stop the loop.
-                                }
-                            }
-                        }
-
-                        // We need more than 1 files to be shown as duplicate.
-                        if (count($filteredFiles) > 1) {
-                            $duplicateFiles[$key] = $filteredFiles;
-                        } else {
-                            unset($duplicateFiles[$key]);
-                        }
-                    }
-                    $duplicateFilesReports[] = array(
-                        'storage' => $storage,
-                        'duplicateFiles' => $duplicateFiles,
-                        'numberOfDuplicateFiles' => count($duplicateFiles),
-                    );
-
-                }
-            }
-        }
-
-        $view->assign('duplicateFilesReports', $duplicateFilesReports);
-
-        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 \TYPO3\CMS\Core\Resource\File $file */
-            try {
-                $file = ResourceFactory::getInstance()->getFileObject($fileUid);
-                if ($file->exists()) {
-
-                    $numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
-                    if ($numberOfReferences === 0) {
-                        $file->delete();
-                    }
-                } else {
-                    $this->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $file->getUid());
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
-
-    /**
-     * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
-     */
-    protected function getThumbnailGenerator()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * Tell whether the tools should be displayed according to the context.
-     *
-     * @return bool
-     */
-    public function isShown()
-    {
-        return true;
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * Display the title of the tool on the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getTitle()
+	{
+		return 'Find duplicate Files';
+	}
+
+	/**
+	 * Display the description of the tool in the welcome screen.
+	 *
+	 * @return string
+	 */
+	public function getDescription()
+	{
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+		$view->assign('isAdmin', $this->getBackendUser()->isAdmin());
+		$view->assign('sitePath', PATH_site);
+		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['deleteDuplicateFiles'])) {
+			$this->deleteMissingFilesAction($arguments['files']);
+		}
+
+		$templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/WorkResult.html';
+		$view = $this->initializeStandaloneView($templateNameAndPath);
+
+		$duplicateFilesReports = [];
+
+		if ($this->getBackendUser()->isAdmin()) {
+			foreach ($this->getStorageRepository()->findAll() as $storage) {
+				if ($storage->isOnline()) {
+					$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
+					$duplicateFilesReports[] = array(
+						'storage' => $storage,
+						'duplicateFiles' => $duplicateFiles,
+						'numberOfDuplicateFiles' => count($duplicateFiles),
+					);
+				}
+			}
+		} else {
+
+			$fileMounts = $this->getBackendUser()->getFileMountRecords();
+
+			$allowedStorages = [];
+			foreach ($fileMounts as $fileMount) {
+				if ((bool)$fileMount['read_only']) {
+					continue;
+				}
+
+				if (!isset($allowedStorages[$fileMount['base']])) {
+					$allowedStorages[$fileMount['base']] = [];
+				}
+				if (!in_array($fileMount['base'], $allowedStorages)) {
+					$allowedStorages[$fileMount['base']][] = $fileMount['path'];
+				}
+			}
+
+			foreach ($allowedStorages as $storageIdentifier => $allowedMountPoints) {
+				$storage = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
+
+				if ($storage->isOnline()) {
+
+					$duplicateFiles = $this->getIndexAnalyser()->searchForDuplicateSha1($storage);
+
+					// Filter duplicates files
+					foreach ($duplicateFiles as $key => $files) {
+
+						$filteredFiles = [];
+						foreach ($files as $file) {
+
+							foreach ($allowedMountPoints as $allowedMountPoint) {
+
+								$pattern = '%^' . $allowedMountPoint . '%isU';
+								if (preg_match($pattern, $file['identifier'])) {
+									$filteredFiles[] = $file;
+									break; // no need to further loop around, stop the loop.
+								}
+							}
+						}
+
+						// We need more than 1 files to be shown as duplicate.
+						if (count($filteredFiles) > 1) {
+							$duplicateFiles[$key] = $filteredFiles;
+						} else {
+							unset($duplicateFiles[$key]);
+						}
+					}
+					$duplicateFilesReports[] = array(
+						'storage' => $storage,
+						'duplicateFiles' => $duplicateFiles,
+						'numberOfDuplicateFiles' => count($duplicateFiles),
+					);
+
+				}
+			}
+		}
+
+		$view->assign('duplicateFilesReports', $duplicateFilesReports);
+
+		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 \TYPO3\CMS\Core\Resource\File $file */
+			try {
+				$file = ResourceFactory::getInstance()->getFileObject($fileUid);
+				if ($file->exists()) {
+
+					$numberOfReferences = $this->getFileReferenceService()->countTotalReferences($file);
+					if ($numberOfReferences === 0) {
+						$file->delete();
+					}
+				} else {
+					$this->getDatabaseConnection()->exec_DELETEquery('sys_file', 'uid = ' . $file->getUid());
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
+
+	/**
+	 * @return \Fab\Media\Thumbnail\ThumbnailGenerator|object
+	 */
+	protected function getThumbnailGenerator()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Thumbnail\ThumbnailGenerator::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * Tell whether the tools should be displayed according to the context.
+	 *
+	 * @return bool
+	 */
+	public function isShown()
+	{
+		return true;
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 
 }
 

Classes/Form/FileUploadTceForms.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
         // Get the base prefix.
         $basePrefix = $this->getBasePrefix($this->getPrefix());
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
+        $filePath = ExtensionManagementUtility::extPath('media').'Resources/Private/Standalone/FileUploadTceForms.js';
 
         return sprintf(file_get_contents($filePath),
             $basePrefix,

Indentation +53 added lines, -53 removed lines

@@ -20,64 +20,64 @@
 class FileUploadTceForms extends FileUpload
 {
 
-    /**
-     * @var string
-     */
-    protected $templateFile = 'Resources/Private/Standalone/FileUploadTceFormsTemplate.html';
+	/**
+	 * @var string
+	 */
+	protected $templateFile = 'Resources/Private/Standalone/FileUploadTceFormsTemplate.html';
 
-    /**
-     * Fetch the JavaScript to be rendered and replace the markers with "live" variables.
-     *
-     * @return string
-     */
-    protected function getJavaScript()
-    {
+	/**
+	 * Fetch the JavaScript to be rendered and replace the markers with "live" variables.
+	 *
+	 * @return string
+	 */
+	protected function getJavaScript()
+	{
 
-        // Get the base prefix.
-        $basePrefix = $this->getBasePrefix($this->getPrefix());
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
+		// Get the base prefix.
+		$basePrefix = $this->getBasePrefix($this->getPrefix());
+		$filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
 
-        return sprintf(file_get_contents($filePath),
-            $basePrefix,
-            $this->elementId,
-            $this->getModuleUrl(),
-            $this->getAllowedExtension(),
-            GeneralUtility::getMaxUploadFileSize() * 1024,
-            $this->getValue()
-        );
-    }
+		return sprintf(file_get_contents($filePath),
+			$basePrefix,
+			$this->elementId,
+			$this->getModuleUrl(),
+			$this->getAllowedExtension(),
+			GeneralUtility::getMaxUploadFileSize() * 1024,
+			$this->getValue()
+		);
+	}
 
-    /**
-     * @return string
-     */
-    protected function getModuleUrl()
-    {
-        $moduleSignature = MediaModule::getSignature();
-        return BackendUtility::getModuleUrl($moduleSignature);
-    }
+	/**
+	 * @return string
+	 */
+	protected function getModuleUrl()
+	{
+		$moduleSignature = MediaModule::getSignature();
+		return BackendUtility::getModuleUrl($moduleSignature);
+	}
 
-    /**
-     * Get allowed extension.
-     *
-     * @return string
-     */
-    protected function getAllowedExtension()
-    {
-        return $this->file->getExtension();
-    }
+	/**
+	 * Get allowed extension.
+	 *
+	 * @return string
+	 */
+	protected function getAllowedExtension()
+	{
+		return $this->file->getExtension();
+	}
 
-    /**
-     * Returns additional file info.
-     *
-     * @return string
-     */
-    protected function getFileInfo()
-    {
-        /** @var \Fab\Media\ViewHelpers\MetadataViewHelper $metadataViewHelper */
-        $metadataViewHelper = GeneralUtility::makeInstance(\Fab\Media\ViewHelpers\MetadataViewHelper::class);
+	/**
+	 * Returns additional file info.
+	 *
+	 * @return string
+	 */
+	protected function getFileInfo()
+	{
+		/** @var \Fab\Media\ViewHelpers\MetadataViewHelper $metadataViewHelper */
+		$metadataViewHelper = GeneralUtility::makeInstance(\Fab\Media\ViewHelpers\MetadataViewHelper::class);
 
-        return sprintf('<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
-            $metadataViewHelper->render($this->file)
-        );
-    }
+		return sprintf('<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
+			$metadataViewHelper->render($this->file)
+		);
+	}
 }

Classes/Form/FileUpload.php

Spacing +5 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
     public function __construct()
     {
         $this->addLanguage();
-        $this->elementId = 'jquery-wrapped-fine-uploader-' . uniqid();
+        $this->elementId = 'jquery-wrapped-fine-uploader-'.uniqid();
 
         $this->template = <<<EOF
 <div class="control-group control-group-upload" style="%s">
@@ -74,7 +74,7 @@ 
     {
         /** @var PageRenderer $pageRenderer */
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $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');
     }
 
     /**
@@ -161,7 +161,7 @@ 
         /** @var \TYPO3\CMS\Fluid\View\StandaloneView $view */
         $view = $objectManager->get('TYPO3\CMS\Fluid\View\StandaloneView');
 
-        $templatePathAndFilename = ExtensionManagementUtility::extPath('media') . $this->templateFile;
+        $templatePathAndFilename = ExtensionManagementUtility::extPath('media').$this->templateFile;
         $view->setTemplatePathAndFilename($templatePathAndFilename);
 
         return $view;
@@ -178,7 +178,7 @@ 
         // Get the base prefix
         $basePrefix = $this->getBasePrefix($this->getPrefix());
 
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUpload.js';
+        $filePath = ExtensionManagementUtility::extPath('media').'Resources/Private/Standalone/FileUpload.js';
 
         return sprintf(
             file_get_contents($filePath),
@@ -188,8 +188,7 @@ 
             $this->getAllowedExtensions(),
             GeneralUtility::getMaxUploadFileSize() * 1024,
             $this->isDrivenByFolder() ?
-                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() :
-                $this->getMediaModule()->getCurrentStorage()->getUid() . ':/'
+                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() : $this->getMediaModule()->getCurrentStorage()->getUid().':/'
 
         );
     }

Indentation +232 added lines, -232 removed lines

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

Classes/Form/AbstractFormField.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
             reset($attribute);
             $key = key($attribute);
             if (!is_string($key)) {
-                throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
+                throw new InvalidStringException('Not an associative array. Is not a key: '.$key, 1356478742);
             }
 
             $this->attributes[$key] = $attribute[$key];

Indentation +262 added lines, -262 removed lines

@@ -18,267 +18,267 @@
 abstract class AbstractFormField implements FormFieldInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $template = '';
-
-    /**
-     * @var string
-     */
-    protected $value = '';
-
-    /**
-     * @var string
-     */
-    protected $name = '';
-
-    /**
-     * @var string
-     */
-    protected $id = '';
-
-    /**
-     * @var string
-     */
-    protected $prefix = '';
-
-    /**
-     * @var string
-     */
-    protected $label = '';
-
-    /**
-     * Store what child element will contain this element.
-     *
-     * @var array
-     */
-    protected $items = [];
-
-    /**
-     * Attributes in sense of DOM attribute, e.g. class, style, etc...
-     *
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        return $this->template;
-    }
-
-    /**
-     * Render the label if possible. Otherwise return an empty string.
-     *
-     * @return string
-     */
-    public function renderLabel()
-    {
-        $result = '';
-        if ($this->label) {
-            $template = '<label class="control-label" for="%s">%s</label>';
-
-            if (strpos($this->label, 'LLL:') === 0) {
-                $this->label = LocalizationUtility::translate($this->label, '');
-            }
-
-            $result = sprintf($template,
-                $this->getId(),
-                $this->label
-            );
-        }
-        return $result;
-    }
-
-    /**
-     * Render additional attribute for this DOM element.
-     *
-     * @return string
-     */
-    public function renderAttributes()
-    {
-        $result = '';
-        if (!empty($this->attributes)) {
-            foreach ($this->attributes as $attribute => $value) {
-                $result .= sprintf('%s="%s" ',
-                    htmlspecialchars($attribute),
-                    htmlspecialchars($value)
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Add an additional (DOM) attribute to be added to this template.
-     *
-     * @throws InvalidStringException
-     * @param array $attribute associative array that contains attribute => value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function addAttribute(array $attribute)
-    {
-        if (!empty($attribute)) {
-            reset($attribute);
-            $key = key($attribute);
-            if (!is_string($key)) {
-                throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
-            }
-
-            $this->attributes[$key] = $attribute[$key];
-        }
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getTemplate()
-    {
-        return $this->template;
-    }
-
-    /**
-     * @param string $template
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setTemplate($template)
-    {
-        $this->template = $template;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * @param string $label
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setLabel($label)
-    {
-        $this->label = $label;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * @param string $prefix
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getItems()
-    {
-        return $this->items;
-    }
-
-    /**
-     * @param array $items
-     */
-    public function setItems($items)
-    {
-        $this->items = $items;
-    }
-
-    /**
-     * @return string
-     */
-    public function getValue()
-    {
-        return htmlspecialchars($this->value);
-    }
-
-    /**
-     * @param string $value
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        $result = $this->name;
-        if ($this->getPrefix()) {
-            $result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
-        }
-        return $result;
-    }
-
-    /**
-     * @param string $name
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        if ($this->id === '') {
-            $this->id = DomElement::getInstance()->formatId($this->getName());
-        }
-        return $this->id;
-    }
-
-    /**
-     * @param string $id
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-        return $this;
-    }
-
-    /**
-     * @return array
-     */
-    public function getAttributes()
-    {
-        return $this->attributes;
-    }
-
-    /**
-     * @param array $attributes
-     * @return \Fab\Media\Form\AbstractFormField
-     */
-    public function setAttributes($attributes)
-    {
-        $this->attributes = $attributes;
-        return $this;
-    }
+	/**
+	 * @var string
+	 */
+	protected $template = '';
+
+	/**
+	 * @var string
+	 */
+	protected $value = '';
+
+	/**
+	 * @var string
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string
+	 */
+	protected $id = '';
+
+	/**
+	 * @var string
+	 */
+	protected $prefix = '';
+
+	/**
+	 * @var string
+	 */
+	protected $label = '';
+
+	/**
+	 * Store what child element will contain this element.
+	 *
+	 * @var array
+	 */
+	protected $items = [];
+
+	/**
+	 * Attributes in sense of DOM attribute, e.g. class, style, etc...
+	 *
+	 * @var array
+	 */
+	protected $attributes = [];
+
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * Render the label if possible. Otherwise return an empty string.
+	 *
+	 * @return string
+	 */
+	public function renderLabel()
+	{
+		$result = '';
+		if ($this->label) {
+			$template = '<label class="control-label" for="%s">%s</label>';
+
+			if (strpos($this->label, 'LLL:') === 0) {
+				$this->label = LocalizationUtility::translate($this->label, '');
+			}
+
+			$result = sprintf($template,
+				$this->getId(),
+				$this->label
+			);
+		}
+		return $result;
+	}
+
+	/**
+	 * Render additional attribute for this DOM element.
+	 *
+	 * @return string
+	 */
+	public function renderAttributes()
+	{
+		$result = '';
+		if (!empty($this->attributes)) {
+			foreach ($this->attributes as $attribute => $value) {
+				$result .= sprintf('%s="%s" ',
+					htmlspecialchars($attribute),
+					htmlspecialchars($value)
+				);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Add an additional (DOM) attribute to be added to this template.
+	 *
+	 * @throws InvalidStringException
+	 * @param array $attribute associative array that contains attribute => value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function addAttribute(array $attribute)
+	{
+		if (!empty($attribute)) {
+			reset($attribute);
+			$key = key($attribute);
+			if (!is_string($key)) {
+				throw new InvalidStringException('Not an associative array. Is not a key: ' . $key, 1356478742);
+			}
+
+			$this->attributes[$key] = $attribute[$key];
+		}
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getTemplate()
+	{
+		return $this->template;
+	}
+
+	/**
+	 * @param string $template
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setTemplate($template)
+	{
+		$this->template = $template;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		return $this->label;
+	}
+
+	/**
+	 * @param string $label
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setLabel($label)
+	{
+		$this->label = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getPrefix()
+	{
+		return $this->prefix;
+	}
+
+	/**
+	 * @param string $prefix
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setPrefix($prefix)
+	{
+		$this->prefix = $prefix;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getItems()
+	{
+		return $this->items;
+	}
+
+	/**
+	 * @param array $items
+	 */
+	public function setItems($items)
+	{
+		$this->items = $items;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return htmlspecialchars($this->value);
+	}
+
+	/**
+	 * @param string $value
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setValue($value)
+	{
+		$this->value = $value;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		$result = $this->name;
+		if ($this->getPrefix()) {
+			$result = sprintf('%s[%s]', $this->getPrefix(), $this->name);
+		}
+		return $result;
+	}
+
+	/**
+	 * @param string $name
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getId()
+	{
+		if ($this->id === '') {
+			$this->id = DomElement::getInstance()->formatId($this->getName());
+		}
+		return $this->id;
+	}
+
+	/**
+	 * @param string $id
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setId($id)
+	{
+		$this->id = $id;
+		return $this;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getAttributes()
+	{
+		return $this->attributes;
+	}
+
+	/**
+	 * @param array $attributes
+	 * @return \Fab\Media\Form\AbstractFormField
+	 */
+	public function setAttributes($attributes)
+	{
+		$this->attributes = $attributes;
+		return $this;
+	}
 
 }

Classes/View/Menu/StorageMenu.php

Spacing +2 added lines, -3 removed lines

@@ -78,8 +78,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').')'
             );
         }
 
@@ -87,7 +86,7 @@ 
         $inputs = '';
         foreach ($parameters as $parameter => $value) {
             list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
-            if ($parameter !== $this->moduleLoader->getParameterPrefix() . '[storage]') {
+            if ($parameter !== $this->moduleLoader->getParameterPrefix().'[storage]') {
                 $inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
             }
         }

Doc Comments +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     }
 
     /**
-     * @return string
+     * @return boolean
      */
     protected function isDisplayed()
     {

Indentation +117 added lines, -117 removed lines

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

Classes/View/Button/NewFolder.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                 ->setIcon($this->getIconFactory()->getIcon('actions-document-new', Icon::SIZE_SMALL))
                 ->render();
 
-            $output = '<div style="float: left;">' . $button . '</div>';
+            $output = '<div style="float: left;">'.$button.'</div>';
         }
         return $output;
     }

Indentation +96 added lines, -96 removed lines

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