fabarea / media

Tests/Unit/Utility/PathTest.php

Spacing +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@ 
 	 */
 	public function canResolvesAPath() {
 		$resourceName = uniqid('resource');
-		$expected = 'media/Resources/Public/' . $resourceName;
+		$expected = 'media/Resources/Public/'.$resourceName;
 		$actual = \Fab\Media\Utility\Path::resolvePath($resourceName);
 
 		$this->assertTrue(strpos($actual, $expected) > 0);
-		$this->assertEquals(0, strpos(Environment::getPublicPath() . '/', $expected));
+		$this->assertEquals(0, strpos(Environment::getPublicPath().'/', $expected));
 	}
 
 	/**
@@ -45,11 +45,11 @@ 
 	public function canReturnsAPublicPath() {
 
 		$resourceName = uniqid('resource');
-		$expected = 'media/Resources/Public/' . $resourceName;
+		$expected = 'media/Resources/Public/'.$resourceName;
 		$actual = \Fab\Media\Utility\Path::getRelativePath($resourceName);
 
 		$this->assertTrue(strpos($actual, $expected) > 0);
-		$this->assertFalse(strpos(Environment::getPublicPath() . '/', $expected));
+		$this->assertFalse(strpos(Environment::getPublicPath().'/', $expected));
 	}
 
 	/**

Classes/View/Warning/ConfigurationWarning.php

Indentation +327 added lines, -327 removed lines

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

Spacing +3 added lines, -3 removed lines

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

Classes/Utility/Path.php

Indentation +67 added lines, -67 removed lines

@@ -18,78 +18,78 @@
 class Path
 {
 
-    /**
-     * @var string
-     */
-    static protected $extensionName = 'media';
+	/**
+	 * @var string
+	 */
+	static protected $extensionName = 'media';
 
-    /**
-     * Return a public path pointing to a resource.
-     *
-     * @param string $resource
-     * @return string
-     */
-    static public function getRelativePath($resource)
-    {
+	/**
+	 * Return a public path pointing to a resource.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	static public function getRelativePath($resource)
+	{
 
-        // If file is not found, resolve the path
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath() . '/'));
-        }
+		// If file is not found, resolve the path
+		if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
+			$resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath() . '/'));
+		}
 
-        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath() . '/' . $resource)) . PathUtility::basename($resource);
-    }
+		return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath() . '/' . $resource)) . PathUtility::basename($resource);
+	}
 
-    /**
-     * Resolves path e.g. EXT:media/Resources/Public/foo.png or ../../foo and returns an absolute path to the given resource.
-     *
-     * @param string $resource
-     * @return string
-     */
-    static public function resolvePath($resource)
-    {
-        $resource = self::canonicalPath($resource);
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = 'EXT:' . GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName) . '/Resources/Public/' . $resource;
-        }
-        return GeneralUtility::getFileAbsFileName($resource);
-    }
+	/**
+	 * Resolves path e.g. EXT:media/Resources/Public/foo.png or ../../foo and returns an absolute path to the given resource.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	static public function resolvePath($resource)
+	{
+		$resource = self::canonicalPath($resource);
+		if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
+			$resource = 'EXT:' . GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName) . '/Resources/Public/' . $resource;
+		}
+		return GeneralUtility::getFileAbsFileName($resource);
+	}
 
-    /**
-     * Tell whether a resource exist.
-     *
-     * @param string $resource
-     * @return string
-     */
-    static public function exists($resource)
-    {
-        return is_file(self::resolvePath($resource));
-    }
+	/**
+	 * Tell whether a resource exist.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	static public function exists($resource)
+	{
+		return is_file(self::resolvePath($resource));
+	}
 
-    /**
-     * Tell whether a resource does not exist.
-     *
-     * @param string $resource
-     * @return string
-     */
-    static public function notExists($resource)
-    {
-        return !self::exists($resource);
-    }
+	/**
+	 * Tell whether a resource does not exist.
+	 *
+	 * @param string $resource
+	 * @return string
+	 */
+	static public function notExists($resource)
+	{
+		return !self::exists($resource);
+	}
 
-    /**
-     * Returns a canonical path by stripping relative segment ../foo/../bar will become foo/bar
-     *
-     * @param $resource
-     * @return string
-     */
-    static public function canonicalPath($resource)
-    {
-        $segments = explode('/', $resource);
-        $keys = array_keys($segments, '..');
-        foreach ($keys as $key) {
-            unset($segments[$key]);
-        }
-        return implode('/', $segments);
-    }
+	/**
+	 * Returns a canonical path by stripping relative segment ../foo/../bar will become foo/bar
+	 *
+	 * @param $resource
+	 * @return string
+	 */
+	static public function canonicalPath($resource)
+	{
+		$segments = explode('/', $resource);
+		$keys = array_keys($segments, '..');
+		foreach ($keys as $key) {
+			unset($segments[$key]);
+		}
+		return implode('/', $segments);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -33,11 +33,11 @@ 
     {
 
         // If file is not found, resolve the path
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath() . '/'));
+        if (!is_file(Environment::getPublicPath().'/'.$resource)) {
+            $resource = substr(self::resolvePath($resource), strlen(Environment::getPublicPath().'/'));
         }
 
-        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath() . '/' . $resource)) . PathUtility::basename($resource);
+        return PathUtility::getRelativePathTo(PathUtility::dirname(Environment::getPublicPath().'/'.$resource)).PathUtility::basename($resource);
     }
 
     /**
@@ -49,8 +49,8 @@ 
     static public function resolvePath($resource)
     {
         $resource = self::canonicalPath($resource);
-        if (!is_file(Environment::getPublicPath() . '/' . $resource)) {
-            $resource = 'EXT:' . GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName) . '/Resources/Public/' . $resource;
+        if (!is_file(Environment::getPublicPath().'/'.$resource)) {
+            $resource = 'EXT:'.GeneralUtility::camelCaseToLowerCaseUnderscored(self::$extensionName).'/Resources/Public/'.$resource;
         }
         return GeneralUtility::getFileAbsFileName($resource);
     }

Classes/Tool/MissingFilesFinderTool.php

Indentation +123 added lines, -123 removed lines

@@ -22,129 +22,129 @@
 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 \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->getDataService()->delete('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 object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::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 \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->getDataService()->delete('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 object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 
 }
 

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

Classes/Tool/DuplicateFilesFinderTool.php

Indentation +200 added lines, -200 removed lines

@@ -21,206 +21,206 @@
 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', 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['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->getDataService()->delete('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 object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
+	/**
+	 * 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', 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['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->getDataService()->delete('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 object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/DuplicateFilesFinder/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
         $view->assign('isAdmin', $this->getBackendUser()->isAdmin());
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -108,7 +108,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.

Classes/Tool/ThumbnailGeneratorTool.php

Indentation +119 added lines, -119 removed lines

@@ -20,125 +20,125 @@
 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', Environment::getPublicPath() . '/');
-        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();
-    }
+	/**
+	 * 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', Environment::getPublicPath() . '/');
+		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();
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     {
         $templateNameAndPath = 'EXT:media/Resources/Private/Standalone/Tool/ThumbnailGenerator/Launcher.html';
         $view = $this->initializeStandaloneView($templateNameAndPath);
-        $view->assign('sitePath', Environment::getPublicPath() . '/');
+        $view->assign('sitePath', Environment::getPublicPath().'/');
         return $view->render();
     }
 
@@ -81,7 +81,7 @@ 
                         $formattedResultSet[] = sprintf('* File "%s": %s %s',
                             $result['fileUid'],
                             $result['fileIdentifier'],
-                            empty($result['thumbnailUri']) ? '' : ' -> ' . $result['thumbnailUri']
+                            empty($result['thumbnailUri']) ? '' : ' -> '.$result['thumbnailUri']
                         );
                     }
 

Classes/Tool/CacheWarmUpTool.php

Indentation +59 added lines, -59 removed lines

@@ -18,73 +18,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', 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 = [])
-    {
+	/**
+	 * 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 Environment::getPublicPath() . '/typo3temp/.media_cache_warmed_up';
-    }
+	/**
+	 * @return string
+	 */
+	protected function getWarmUpSemaphorFile()
+	{
+		return Environment::getPublicPath() . '/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);
+	}
 
 }
 

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';
     }
 
     /**

Classes/Tool/DuplicateRecordsFinderTool.php

Indentation +80 added lines, -80 removed lines

@@ -20,86 +20,86 @@
 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 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);
-
-        $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);
-
-        return $view->render();
-    }
-
-    /**
-     * 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();
-    }
+	/**
+	 * 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();
+	}
+
+	/**
+	 * 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),
+				);
+			}
+		}
+
+		$view->assign('duplicateRecordsReports', $duplicateRecordsReports);
+
+		return $view->render();
+	}
+
+	/**
+	 * 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();
+	}
 
 }
 

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

Classes/FileUpload/Optimizer/Rotate.php

Indentation +149 added lines, -149 removed lines

@@ -18,154 +18,154 @@
 class Rotate implements ImageOptimizerInterface
 {
 
-    /**
-     * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
-     */
-    protected $gifCreator;
-
-    /**
-     * @return \Fab\Media\FileUpload\Optimizer\Rotate
-     */
-    public function __construct()
-    {
-        $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
-        $this->gifCreator->init();
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
-    }
-
-    /**
-     * Optimize the given uploaded image
-     *
-     * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
-     * @return \Fab\Media\FileUpload\UploadedFileInterface
-     */
-    public function optimize($uploadedFile)
-    {
-
-        $orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
-        $isRotated = $this->isRotated($orientation);
-
-        // Only rotate image if necessary!
-        if ($isRotated > 0) {
-            $transformation = $this->getTransformation($orientation);
-
-            $imParams = '###SkipStripProfile###';
-            if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
-            }
-
-            $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
-            if ($tempFileInfo) {
-                // Replace original file
-                @unlink($uploadedFile->getFileWithAbsolutePath());
-                @rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
-
-                if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
-                    $this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
-                }
-            }
-        }
-        return $uploadedFile;
-    }
-
-    /**
-     * Returns the EXIF orientation of a given picture.
-     *
-     * @param string $filename
-     * @return integer
-     */
-    protected function getOrientation($filename)
-    {
-        $extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
-        $orientation = 1; // Fallback to "straight"
-        if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
-            try {
-                $exif = exif_read_data($filename);
-                if ($exif) {
-                    $orientation = $exif['Orientation'];
-                }
-            } catch (\Exception $e) {}
-        }
-        return $orientation;
-    }
-
-    /**
-     * Returns true if the given picture is rotated.
-     *
-     * @param integer $orientation EXIF orientation
-     * @return integer
-     * @see http://www.impulseadventure.com/photo/exif-orientation.html
-     */
-    protected function isRotated($orientation)
-    {
-        $ret = false;
-        switch ($orientation) {
-            case 2: // horizontal flip
-            case 3: // 180°
-            case 4: // vertical flip
-            case 5: // vertical flip + 90 rotate right
-            case 6: // 90° rotate right
-            case 7: // horizontal flip + 90 rotate right
-            case 8: // 90° rotate left
-                $ret = true;
-                break;
-        }
-        return $ret;
-    }
-
-    /**
-     * Returns a command line parameter to fix the orientation of a rotated picture.
-     *
-     * @param integer $orientation
-     * @return string
-     */
-    protected function getTransformation($orientation)
-    {
-        $transformation = '';
-        if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
-            // ImageMagick
-            if ($orientation >= 2 && $orientation <= 8) {
-                $transformation = '-auto-orient';
-            }
-        } else {
-            // GraphicsMagick
-            switch ($orientation) {
-                case 2: // horizontal flip
-                    $transformation = '-flip horizontal';
-                    break;
-                case 3: // 180°
-                    $transformation = '-rotate 180';
-                    break;
-                case 4: // vertical flip
-                    $transformation = '-flip vertical';
-                    break;
-                case 5: // vertical flip + 90 rotate right
-                    $transformation = '-transpose';
-                    break;
-                case 6: // 90° rotate right
-                    $transformation = '-rotate 90';
-                    break;
-                case 7: // horizontal flip + 90 rotate right
-                    $transformation = '-transverse';
-                    break;
-                case 8: // 90° rotate left
-                    $transformation = '-rotate 270';
-                    break;
-            }
-        }
-        return $transformation;
-    }
-
-    /**
-     * Resets the EXIF orientation flag of a picture.
-     *
-     * @param string $filename
-     * @return void
-     * @see http://sylvana.net/jpegcrop/exif_orientation.html
-     */
-    protected function resetOrientation($filename)
-    {
-        JpegExifOrient::setOrientation($filename, 1);
-    }
+	/**
+	 * @var \TYPO3\CMS\Frontend\Imaging\GifBuilder
+	 */
+	protected $gifCreator;
+
+	/**
+	 * @return \Fab\Media\FileUpload\Optimizer\Rotate
+	 */
+	public function __construct()
+	{
+		$this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
+		$this->gifCreator->init();
+		$this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+	}
+
+	/**
+	 * Optimize the given uploaded image
+	 *
+	 * @param \Fab\Media\FileUpload\UploadedFileInterface $uploadedFile
+	 * @return \Fab\Media\FileUpload\UploadedFileInterface
+	 */
+	public function optimize($uploadedFile)
+	{
+
+		$orientation = $this->getOrientation($uploadedFile->getFileWithAbsolutePath());
+		$isRotated = $this->isRotated($orientation);
+
+		// Only rotate image if necessary!
+		if ($isRotated > 0) {
+			$transformation = $this->getTransformation($orientation);
+
+			$imParams = '###SkipStripProfile###';
+			if ($transformation !== '') {
+				$imParams .= ' ' . $transformation;
+			}
+
+			$tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);
+			if ($tempFileInfo) {
+				// Replace original file
+				@unlink($uploadedFile->getFileWithAbsolutePath());
+				@rename($tempFileInfo[3], $uploadedFile->getFileWithAbsolutePath());
+
+				if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] === 'gm') {
+					$this->resetOrientation($uploadedFile->getFileWithAbsolutePath());
+				}
+			}
+		}
+		return $uploadedFile;
+	}
+
+	/**
+	 * Returns the EXIF orientation of a given picture.
+	 *
+	 * @param string $filename
+	 * @return integer
+	 */
+	protected function getOrientation($filename)
+	{
+		$extension = strtolower(substr($filename, strrpos($filename, '.') + 1));
+		$orientation = 1; // Fallback to "straight"
+		if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('jpg,jpeg,tif,tiff', $extension) && function_exists('exif_read_data')) {
+			try {
+				$exif = exif_read_data($filename);
+				if ($exif) {
+					$orientation = $exif['Orientation'];
+				}
+			} catch (\Exception $e) {}
+		}
+		return $orientation;
+	}
+
+	/**
+	 * Returns true if the given picture is rotated.
+	 *
+	 * @param integer $orientation EXIF orientation
+	 * @return integer
+	 * @see http://www.impulseadventure.com/photo/exif-orientation.html
+	 */
+	protected function isRotated($orientation)
+	{
+		$ret = false;
+		switch ($orientation) {
+			case 2: // horizontal flip
+			case 3: // 180°
+			case 4: // vertical flip
+			case 5: // vertical flip + 90 rotate right
+			case 6: // 90° rotate right
+			case 7: // horizontal flip + 90 rotate right
+			case 8: // 90° rotate left
+				$ret = true;
+				break;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Returns a command line parameter to fix the orientation of a rotated picture.
+	 *
+	 * @param integer $orientation
+	 * @return string
+	 */
+	protected function getTransformation($orientation)
+	{
+		$transformation = '';
+		if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] !== 'gm') {
+			// ImageMagick
+			if ($orientation >= 2 && $orientation <= 8) {
+				$transformation = '-auto-orient';
+			}
+		} else {
+			// GraphicsMagick
+			switch ($orientation) {
+				case 2: // horizontal flip
+					$transformation = '-flip horizontal';
+					break;
+				case 3: // 180°
+					$transformation = '-rotate 180';
+					break;
+				case 4: // vertical flip
+					$transformation = '-flip vertical';
+					break;
+				case 5: // vertical flip + 90 rotate right
+					$transformation = '-transpose';
+					break;
+				case 6: // 90° rotate right
+					$transformation = '-rotate 90';
+					break;
+				case 7: // horizontal flip + 90 rotate right
+					$transformation = '-transverse';
+					break;
+				case 8: // 90° rotate left
+					$transformation = '-rotate 270';
+					break;
+			}
+		}
+		return $transformation;
+	}
+
+	/**
+	 * Resets the EXIF orientation flag of a picture.
+	 *
+	 * @param string $filename
+	 * @return void
+	 * @see http://sylvana.net/jpegcrop/exif_orientation.html
+	 */
+	protected function resetOrientation($filename)
+	{
+		JpegExifOrient::setOrientation($filename, 1);
+	}
 
 }

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
     {
         $this->gifCreator = GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\Imaging\GifBuilder::class);
         $this->gifCreator->init();
-        $this->gifCreator->absPrefix = Environment::getPublicPath() . '/';
+        $this->gifCreator->absPrefix = Environment::getPublicPath().'/';
     }
 
     /**
@@ -51,7 +51,7 @@ 
 
             $imParams = '###SkipStripProfile###';
             if ($transformation !== '') {
-                $imParams .= ' ' . $transformation;
+                $imParams .= ' '.$transformation;
             }
 
             $tempFileInfo = $this->gifCreator->imageMagickConvert($uploadedFile->getFileWithAbsolutePath(), '', '', '', $imParams, '', [], true);