fabarea / media

Classes/Controller/LinkCreatorController.php

Indentation +27 added lines, -27 removed lines

@@ -23,32 +23,32 @@
 class LinkCreatorController extends ActionController
 {
 
-    /**
-     * Initializes the controller before invoking an action method.
-     */
-    public function initializeAction()
-    {
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-
-            /** @var \Fab\Media\TypeConverter\FileConverter $typeConverter */
-            $typeConverter = $this->objectManager->get('Fab\Media\TypeConverter\FileConverter');
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * Handle GUI for creating a link in the RTE.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function showAction(File $file)
-    {
-        $this->view->assign('file', $file);
-    }
+	/**
+	 * Initializes the controller before invoking an action method.
+	 */
+	public function initializeAction()
+	{
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+
+			/** @var \Fab\Media\TypeConverter\FileConverter $typeConverter */
+			$typeConverter = $this->objectManager->get('Fab\Media\TypeConverter\FileConverter');
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * Handle GUI for creating a link in the RTE.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function showAction(File $file)
+	{
+		$this->view->assign('file', $file);
+	}
 
 }

Classes/View/Plugin/FilePickerPlugin.php

Indentation +25 added lines, -25 removed lines

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

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
  */
 
 use Fab\Vidi\View\AbstractComponentView;
-use Fab\Media\Utility\Path;
 use TYPO3\CMS\Core\Page\PageRenderer;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 

Classes/Module/MediaModule.php

Spacing +5 added lines, -5 removed lines

@@ -232,7 +232,7 @@ 
         }
 
         // Retrieve the folder object.
-        $folder = ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
+        $folder = ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($storage->getUid().':'.$identifier);
 
         // Disallow the rendering of the processing folder (e.g. could be called manually)
         // and all folders without any defined storage
@@ -289,11 +289,11 @@ 
 
         // Get a possible mount point coming from the storage record.
         $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $uploadedFile->getType()];
+        $mountPointIdentifier = $storageRecord['mount_point_file_type_'.$uploadedFile->getType()];
         if ($mountPointIdentifier > 0) {
 
             // We don't have a Mount Point repository in FAL, so query the database directly.
-            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = ' . $mountPointIdentifier);
+            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = '.$mountPointIdentifier);
             if (!empty($record['path'])) {
                 $folder = $storage->getFolder($record['path']);
             }
@@ -316,12 +316,12 @@ 
 
         // Retrieve storage record and a possible configured mount point.
         $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $file->getType()];
+        $mountPointIdentifier = $storageRecord['mount_point_file_type_'.$file->getType()];
 
         if ($mountPointIdentifier > 0) {
 
             // We don't have a Mount Point repository in FAL, so query the database directly.
-            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = ' . $mountPointIdentifier);
+            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = '.$mountPointIdentifier);
             if (!empty($record['path'])) {
                 $folder = $storage->getFolder($record['path']);
             }

Indentation +336 added lines, -336 removed lines

@@ -25,341 +25,341 @@
 class MediaModule implements SingletonInterface
 {
 
-    /**
-     * @var string
-     */
-    const SIGNATURE = 'user_MediaM1';
-
-    /**
-     * @var string
-     */
-    const PARAMETER_PREFIX = 'tx_media_user_mediam1';
-
-    /**
-     * @var ResourceStorage
-     */
-    protected $currentStorage;
-
-    /**
-     * @return string
-     */
-    static public function getSignature()
-    {
-        return self::SIGNATURE;
-    }
-
-    /**
-     * @return string
-     */
-    static public function getParameterPrefix()
-    {
-        return self::PARAMETER_PREFIX;
-    }
-
-    /**
-     * Return all storage allowed for the Backend User.
-     *
-     * @throws \RuntimeException
-     * @return ResourceStorage[]
-     */
-    public function getAllowedStorages()
-    {
-
-        $storages = $this->getBackendUser()->getFileStorages();
-        if (empty($storages)) {
-            throw new \RuntimeException('No storage is accessible for the current BE User. Forgotten to define a mount point for this BE User?', 1380801970);
-        }
-        return $storages;
-    }
-
-    /**
-     * Returns the current file storage in use.
-     *
-     * @return ResourceStorage
-     */
-    public function getCurrentStorage()
-    {
-        if (is_null($this->currentStorage)) {
-
-            $storageIdentifier = $this->getStorageIdentifierFromSessionOrArguments();
-
-            if ($storageIdentifier > 0) {
-                $currentStorage = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
-            } else {
-
-                // We differentiate the cases whether the User is admin or not.
-                if ($this->getBackendUser()->isAdmin()) {
-
-                    $currentStorage = ResourceFactory::getInstance()->getDefaultStorage();
-
-                    // Not default storage has been flagged in "sys_file_storage".
-                    // Fallback approach: take the first storage as the current.
-                    if (!$currentStorage) {
-                        /** @var $storageRepository StorageRepository */
-                        $storageRepository = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-
-                        $storages = $storageRepository->findAll();
-                        $currentStorage = current($storages);
-                    }
-                } else {
-                    $fileMounts = $this->getBackendUser()->getFileMountRecords();
-                    $firstFileMount = current($fileMounts);
-                    $currentStorage = ResourceFactory::getInstance()->getStorageObject($firstFileMount['base']);
-                }
-            }
-
-            $this->currentStorage = $currentStorage;
-        }
-        return $this->currentStorage;
-    }
-
-    /**
-     * Retrieve a possible storage identifier from the session or from the arguments.
-     *
-     * @return int
-     */
-    protected function getStorageIdentifierFromSessionOrArguments()
-    {
-
-        // Default value
-        $storageIdentifier = 0;
-
-        // Get last selected storage from User settings
-        if (SessionUtility::getInstance()->get('lastSelectedStorage') > 0) {
-            $storageIdentifier = SessionUtility::getInstance()->get('lastSelectedStorage');
-        }
-
-        $argumentPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $arguments = GeneralUtility::_GET($argumentPrefix);
-
-        // Override selected storage from the session if GET argument "storage" is detected.
-        if (!empty($arguments['storage']) && (int)$arguments['storage'] > 0) {
-            $storageIdentifier = (int)$arguments['storage'];
-
-            // Save state
-            SessionUtility::getInstance()->set('lastSelectedStorage', $storageIdentifier);
-        }
-
-        return (int)$storageIdentifier;
-    }
-
-    /**
-     * Return the combined parameter from the URL.
-     *
-     * @return string
-     */
-    public function getCombinedIdentifier()
-    {
-
-        // Fetch possible combined identifier.
-        $combinedIdentifier = GeneralUtility::_GET('id');
-
-        if ($combinedIdentifier) {
-
-            // Fix a bug at the Core level: the "id" parameter is encoded again when translating file.
-            // Add a loop to decode maximum 999 time!
-            $semaphore = 0;
-            $semaphoreLimit = 999;
-            while (!$this->isWellDecoded($combinedIdentifier) && $semaphore < $semaphoreLimit) {
-                $combinedIdentifier = urldecode($combinedIdentifier);
-                $semaphore++;
-            }
-        }
-
-        return $combinedIdentifier;
-    }
-
-    /**
-     * @param $combinedIdentifier
-     * @return bool
-     */
-    protected function isWellDecoded($combinedIdentifier)
-    {
-        return preg_match('/.*:.*/', $combinedIdentifier);
-    }
-
-    /**
-     * @return Folder
-     */
-    public function getFirstAvailableFolder()
-    {
-
-        // Take the first object of the first storage.
-        $storages = $this->getBackendUser()->getFileStorages();
-        $storage = reset($storages);
-        if ($storage) {
-            $folder = $storage->getRootLevelFolder();
-        } else {
-            throw new \RuntimeException('Could not find any folder to be displayed.', 1444665954);
-        }
-        return $folder;
-    }
-
-    /**
-     * @return Folder
-     */
-    public function getCurrentFolder()
-    {
-
-        $combinedIdentifier = $this->getCombinedIdentifier();
-
-        if ($combinedIdentifier) {
-            $folder = $this->getFolderForCombinedIdentifier($combinedIdentifier);
-        } else {
-            $folder = $this->getFirstAvailableFolder();
-        }
-
-        return $folder;
-    }
-
-    /**
-     * @param string $combinedIdentifier
-     * @return Folder
-     */
-    public function getFolderForCombinedIdentifier($combinedIdentifier)
-    {
-
-        // Code taken from FileListController.php
-        $storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-        $identifier = substr($combinedIdentifier, strpos($combinedIdentifier, ':') + 1);
-        if (!$storage->hasFolder($identifier)) {
-            $identifier = $storage->getFolderIdentifierFromFileIdentifier($identifier);
-        }
-
-        // Retrieve the folder object.
-        $folder = ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
-
-        // Disallow the rendering of the processing folder (e.g. could be called manually)
-        // and all folders without any defined storage
-        if ($folder && ($folder->getStorage()->getUid() == 0 || trim($folder->getStorage()->getProcessingFolder()->getIdentifier(), '/') === trim($folder->getIdentifier(), '/'))) {
-            $storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-            $folder = $storage->getRootLevelFolder();
-        }
-
-        return $folder;
-    }
-
-    /**
-     * Tell whether the Folder Tree is display or not.
-     *
-     * @return bool
-     */
-    public function hasFolderTree()
-    {
-        $configuration = $this->getModuleConfiguration();
-        return (bool)$configuration['has_folder_tree'];
-    }
-
-    /**
-     * Tell whether the sub-folders must be included when browsing.
-     *
-     * @return bool
-     */
-    public function hasRecursiveSelection()
-    {
-
-        $parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $parameters = GeneralUtility::_GET($parameterPrefix);
-
-        $hasRecursiveSelection = true;
-        if (isset($parameters['hasRecursiveSelection'])) {
-            $hasRecursiveSelection = (bool)$parameters['hasRecursiveSelection'];
-        }
-
-        return $hasRecursiveSelection;
-    }
-
-    /**
-     * Return the target folder for the uploaded file.
-     *
-     * @param UploadedFileInterface $uploadedFile
-     * @param ResourceStorage $storage
-     * @return \TYPO3\CMS\Core\Resource\Folder
-     */
-    public function getTargetFolderForUploadedFile(UploadedFileInterface $uploadedFile, ResourceStorage $storage)
-    {
-
-        // default is the root level
-        $folder = $storage->getRootLevelFolder(); // get the root folder by default
-
-        // Get a possible mount point coming from the storage record.
-        $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $uploadedFile->getType()];
-        if ($mountPointIdentifier > 0) {
-
-            // We don't have a Mount Point repository in FAL, so query the database directly.
-            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = ' . $mountPointIdentifier);
-            if (!empty($record['path'])) {
-                $folder = $storage->getFolder($record['path']);
-            }
-        }
-        return $folder;
-    }
-
-    /**
-     * Return a new target folder when moving file from one storage to another.
-     *
-     * @param ResourceStorage $storage
-     * @param File $file
-     * @return \TYPO3\CMS\Core\Resource\Folder
-     */
-    public function getDefaultFolderInStorage(ResourceStorage $storage, File $file)
-    {
-
-        // default is the root level
-        $folder = $storage->getRootLevelFolder();
-
-        // Retrieve storage record and a possible configured mount point.
-        $storageRecord = $storage->getStorageRecord();
-        $mountPointIdentifier = $storageRecord['mount_point_file_type_' . $file->getType()];
-
-        if ($mountPointIdentifier > 0) {
-
-            // We don't have a Mount Point repository in FAL, so query the database directly.
-            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = ' . $mountPointIdentifier);
-            if (!empty($record['path'])) {
-                $folder = $storage->getFolder($record['path']);
-            }
-        }
-        return $folder;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getModuleConfiguration()
-    {
-        return GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection|object
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
-
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
-
-    /**
-     * Return the module loader.
-     *
-     * @return \Fab\Vidi\Module\ModuleLoader|object
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
-    }
+	/**
+	 * @var string
+	 */
+	const SIGNATURE = 'user_MediaM1';
+
+	/**
+	 * @var string
+	 */
+	const PARAMETER_PREFIX = 'tx_media_user_mediam1';
+
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $currentStorage;
+
+	/**
+	 * @return string
+	 */
+	static public function getSignature()
+	{
+		return self::SIGNATURE;
+	}
+
+	/**
+	 * @return string
+	 */
+	static public function getParameterPrefix()
+	{
+		return self::PARAMETER_PREFIX;
+	}
+
+	/**
+	 * Return all storage allowed for the Backend User.
+	 *
+	 * @throws \RuntimeException
+	 * @return ResourceStorage[]
+	 */
+	public function getAllowedStorages()
+	{
+
+		$storages = $this->getBackendUser()->getFileStorages();
+		if (empty($storages)) {
+			throw new \RuntimeException('No storage is accessible for the current BE User. Forgotten to define a mount point for this BE User?', 1380801970);
+		}
+		return $storages;
+	}
+
+	/**
+	 * Returns the current file storage in use.
+	 *
+	 * @return ResourceStorage
+	 */
+	public function getCurrentStorage()
+	{
+		if (is_null($this->currentStorage)) {
+
+			$storageIdentifier = $this->getStorageIdentifierFromSessionOrArguments();
+
+			if ($storageIdentifier > 0) {
+				$currentStorage = ResourceFactory::getInstance()->getStorageObject($storageIdentifier);
+			} else {
+
+				// We differentiate the cases whether the User is admin or not.
+				if ($this->getBackendUser()->isAdmin()) {
+
+					$currentStorage = ResourceFactory::getInstance()->getDefaultStorage();
+
+					// Not default storage has been flagged in "sys_file_storage".
+					// Fallback approach: take the first storage as the current.
+					if (!$currentStorage) {
+						/** @var $storageRepository StorageRepository */
+						$storageRepository = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+
+						$storages = $storageRepository->findAll();
+						$currentStorage = current($storages);
+					}
+				} else {
+					$fileMounts = $this->getBackendUser()->getFileMountRecords();
+					$firstFileMount = current($fileMounts);
+					$currentStorage = ResourceFactory::getInstance()->getStorageObject($firstFileMount['base']);
+				}
+			}
+
+			$this->currentStorage = $currentStorage;
+		}
+		return $this->currentStorage;
+	}
+
+	/**
+	 * Retrieve a possible storage identifier from the session or from the arguments.
+	 *
+	 * @return int
+	 */
+	protected function getStorageIdentifierFromSessionOrArguments()
+	{
+
+		// Default value
+		$storageIdentifier = 0;
+
+		// Get last selected storage from User settings
+		if (SessionUtility::getInstance()->get('lastSelectedStorage') > 0) {
+			$storageIdentifier = SessionUtility::getInstance()->get('lastSelectedStorage');
+		}
+
+		$argumentPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$arguments = GeneralUtility::_GET($argumentPrefix);
+
+		// Override selected storage from the session if GET argument "storage" is detected.
+		if (!empty($arguments['storage']) && (int)$arguments['storage'] > 0) {
+			$storageIdentifier = (int)$arguments['storage'];
+
+			// Save state
+			SessionUtility::getInstance()->set('lastSelectedStorage', $storageIdentifier);
+		}
+
+		return (int)$storageIdentifier;
+	}
+
+	/**
+	 * Return the combined parameter from the URL.
+	 *
+	 * @return string
+	 */
+	public function getCombinedIdentifier()
+	{
+
+		// Fetch possible combined identifier.
+		$combinedIdentifier = GeneralUtility::_GET('id');
+
+		if ($combinedIdentifier) {
+
+			// Fix a bug at the Core level: the "id" parameter is encoded again when translating file.
+			// Add a loop to decode maximum 999 time!
+			$semaphore = 0;
+			$semaphoreLimit = 999;
+			while (!$this->isWellDecoded($combinedIdentifier) && $semaphore < $semaphoreLimit) {
+				$combinedIdentifier = urldecode($combinedIdentifier);
+				$semaphore++;
+			}
+		}
+
+		return $combinedIdentifier;
+	}
+
+	/**
+	 * @param $combinedIdentifier
+	 * @return bool
+	 */
+	protected function isWellDecoded($combinedIdentifier)
+	{
+		return preg_match('/.*:.*/', $combinedIdentifier);
+	}
+
+	/**
+	 * @return Folder
+	 */
+	public function getFirstAvailableFolder()
+	{
+
+		// Take the first object of the first storage.
+		$storages = $this->getBackendUser()->getFileStorages();
+		$storage = reset($storages);
+		if ($storage) {
+			$folder = $storage->getRootLevelFolder();
+		} else {
+			throw new \RuntimeException('Could not find any folder to be displayed.', 1444665954);
+		}
+		return $folder;
+	}
+
+	/**
+	 * @return Folder
+	 */
+	public function getCurrentFolder()
+	{
+
+		$combinedIdentifier = $this->getCombinedIdentifier();
+
+		if ($combinedIdentifier) {
+			$folder = $this->getFolderForCombinedIdentifier($combinedIdentifier);
+		} else {
+			$folder = $this->getFirstAvailableFolder();
+		}
+
+		return $folder;
+	}
+
+	/**
+	 * @param string $combinedIdentifier
+	 * @return Folder
+	 */
+	public function getFolderForCombinedIdentifier($combinedIdentifier)
+	{
+
+		// Code taken from FileListController.php
+		$storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+		$identifier = substr($combinedIdentifier, strpos($combinedIdentifier, ':') + 1);
+		if (!$storage->hasFolder($identifier)) {
+			$identifier = $storage->getFolderIdentifierFromFileIdentifier($identifier);
+		}
+
+		// Retrieve the folder object.
+		$folder = ResourceFactory::getInstance()->getFolderObjectFromCombinedIdentifier($storage->getUid() . ':' . $identifier);
+
+		// Disallow the rendering of the processing folder (e.g. could be called manually)
+		// and all folders without any defined storage
+		if ($folder && ($folder->getStorage()->getUid() == 0 || trim($folder->getStorage()->getProcessingFolder()->getIdentifier(), '/') === trim($folder->getIdentifier(), '/'))) {
+			$storage = ResourceFactory::getInstance()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+			$folder = $storage->getRootLevelFolder();
+		}
+
+		return $folder;
+	}
+
+	/**
+	 * Tell whether the Folder Tree is display or not.
+	 *
+	 * @return bool
+	 */
+	public function hasFolderTree()
+	{
+		$configuration = $this->getModuleConfiguration();
+		return (bool)$configuration['has_folder_tree'];
+	}
+
+	/**
+	 * Tell whether the sub-folders must be included when browsing.
+	 *
+	 * @return bool
+	 */
+	public function hasRecursiveSelection()
+	{
+
+		$parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$parameters = GeneralUtility::_GET($parameterPrefix);
+
+		$hasRecursiveSelection = true;
+		if (isset($parameters['hasRecursiveSelection'])) {
+			$hasRecursiveSelection = (bool)$parameters['hasRecursiveSelection'];
+		}
+
+		return $hasRecursiveSelection;
+	}
+
+	/**
+	 * Return the target folder for the uploaded file.
+	 *
+	 * @param UploadedFileInterface $uploadedFile
+	 * @param ResourceStorage $storage
+	 * @return \TYPO3\CMS\Core\Resource\Folder
+	 */
+	public function getTargetFolderForUploadedFile(UploadedFileInterface $uploadedFile, ResourceStorage $storage)
+	{
+
+		// default is the root level
+		$folder = $storage->getRootLevelFolder(); // get the root folder by default
+
+		// Get a possible mount point coming from the storage record.
+		$storageRecord = $storage->getStorageRecord();
+		$mountPointIdentifier = $storageRecord['mount_point_file_type_' . $uploadedFile->getType()];
+		if ($mountPointIdentifier > 0) {
+
+			// We don't have a Mount Point repository in FAL, so query the database directly.
+			$record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = ' . $mountPointIdentifier);
+			if (!empty($record['path'])) {
+				$folder = $storage->getFolder($record['path']);
+			}
+		}
+		return $folder;
+	}
+
+	/**
+	 * Return a new target folder when moving file from one storage to another.
+	 *
+	 * @param ResourceStorage $storage
+	 * @param File $file
+	 * @return \TYPO3\CMS\Core\Resource\Folder
+	 */
+	public function getDefaultFolderInStorage(ResourceStorage $storage, File $file)
+	{
+
+		// default is the root level
+		$folder = $storage->getRootLevelFolder();
+
+		// Retrieve storage record and a possible configured mount point.
+		$storageRecord = $storage->getStorageRecord();
+		$mountPointIdentifier = $storageRecord['mount_point_file_type_' . $file->getType()];
+
+		if ($mountPointIdentifier > 0) {
+
+			// We don't have a Mount Point repository in FAL, so query the database directly.
+			$record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('path', 'sys_filemounts', 'deleted = 0 AND uid = ' . $mountPointIdentifier);
+			if (!empty($record['path'])) {
+				$folder = $storage->getFolder($record['path']);
+			}
+		}
+		return $folder;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getModuleConfiguration()
+	{
+		return GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('media');
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection|object
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
+
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
+
+	/**
+	 * Return the module loader.
+	 *
+	 * @return \Fab\Vidi\Module\ModuleLoader|object
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(\Fab\Vidi\Module\ModuleLoader::class);
+	}
 
 }
\ No newline at end of file

Classes/Utility/ImagePresetUtility.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
     {
         $size = ConfigurationUtility::getInstance()->get($preset);
         if (is_null($size)) {
-            throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
+            throw new \Fab\Media\Exception\EmptyValueException('No value for preset: '.$preset, 1362501066);
         }
 
         $this->currentPreset = $preset;

Indentation +80 added lines, -80 removed lines

@@ -16,92 +16,92 @@
 class ImagePresetUtility implements \TYPO3\CMS\Core\SingletonInterface
 {
 
-    /**
-     * @var array
-     */
-    protected $store = [];
+	/**
+	 * @var array
+	 */
+	protected $store = [];
 
-    /**
-     * @var string
-     */
-    protected $currentPreset = '';
+	/**
+	 * @var string
+	 */
+	protected $currentPreset = '';
 
-    /**
-     * Returns a class instance
-     *
-     * @return \Fab\Media\Utility\ImagePresetUtility|object
-     */
-    static public function getInstance()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Utility\ImagePresetUtility::class);
-    }
+	/**
+	 * Returns a class instance
+	 *
+	 * @return \Fab\Media\Utility\ImagePresetUtility|object
+	 */
+	static public function getInstance()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Utility\ImagePresetUtility::class);
+	}
 
-    /**
-     * Set the current preset value. Preset values come from the settings and can be:
-     * image_thumbnail, image_mini, image_small, image_medium, image_large
-     *
-     * @throws \Fab\Media\Exception\EmptyValueException
-     * @param string $preset image_thumbnail, image_mini, ...
-     * @return \Fab\Media\Utility\ImagePresetUtility
-     */
-    public function preset($preset)
-    {
-        $size = ConfigurationUtility::getInstance()->get($preset);
-        if (is_null($size)) {
-            throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
-        }
+	/**
+	 * Set the current preset value. Preset values come from the settings and can be:
+	 * image_thumbnail, image_mini, image_small, image_medium, image_large
+	 *
+	 * @throws \Fab\Media\Exception\EmptyValueException
+	 * @param string $preset image_thumbnail, image_mini, ...
+	 * @return \Fab\Media\Utility\ImagePresetUtility
+	 */
+	public function preset($preset)
+	{
+		$size = ConfigurationUtility::getInstance()->get($preset);
+		if (is_null($size)) {
+			throw new \Fab\Media\Exception\EmptyValueException('No value for preset: ' . $preset, 1362501066);
+		}
 
-        $this->currentPreset = $preset;
-        if (!isset($this->store[$this->currentPreset])) {
-            // @todo use object Dimension instead
-            $dimensions = GeneralUtility::trimExplode('x', $size);
-            $this->store[$this->currentPreset]['width'] = empty($dimensions[0]) ? 0 : $dimensions[0];
-            $this->store[$this->currentPreset]['height'] = empty($dimensions[1]) ? 0 : $dimensions[1];
-        }
-        return $this;
-    }
+		$this->currentPreset = $preset;
+		if (!isset($this->store[$this->currentPreset])) {
+			// @todo use object Dimension instead
+			$dimensions = GeneralUtility::trimExplode('x', $size);
+			$this->store[$this->currentPreset]['width'] = empty($dimensions[0]) ? 0 : $dimensions[0];
+			$this->store[$this->currentPreset]['height'] = empty($dimensions[1]) ? 0 : $dimensions[1];
+		}
+		return $this;
+	}
 
-    /**
-     * @return array
-     */
-    public function getStore()
-    {
-        return $this->store;
-    }
+	/**
+	 * @return array
+	 */
+	public function getStore()
+	{
+		return $this->store;
+	}
 
-    /**
-     * @param array $store
-     */
-    public function setStore($store)
-    {
-        $this->store = $store;
-    }
+	/**
+	 * @param array $store
+	 */
+	public function setStore($store)
+	{
+		$this->store = $store;
+	}
 
-    /**
-     * Returns width of the current preset.
-     *
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @return int
-     */
-    public function getWidth()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
-        }
-        return (int)$this->store[$this->currentPreset]['width'];
-    }
+	/**
+	 * Returns width of the current preset.
+	 *
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getWidth()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
+		}
+		return (int)$this->store[$this->currentPreset]['width'];
+	}
 
-    /**
-     * Returns height of the current preset.
-     *
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @return int
-     */
-    public function getHeight()
-    {
-        if (empty($this->store[$this->currentPreset])) {
-            throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
-        }
-        return (int)$this->store[$this->currentPreset]['height'];
-    }
+	/**
+	 * Returns height of the current preset.
+	 *
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		if (empty($this->store[$this->currentPreset])) {
+			throw new \Fab\Media\Exception\InvalidKeyInArrayException('No existing values for current preset. Have you set a preset?', 1362501853);
+		}
+		return (int)$this->store[$this->currentPreset]['height'];
+	}
 }

Classes/Thumbnail/ThumbnailGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -85,13 +85,13 @@ 
         // Compute a possible limit and offset for the query.
         $limitAndOffset = '';
         if ($limit > 0 || $offset > 0) {
-            $limitAndOffset = $limit . ' OFFSET ' . $offset;
+            $limitAndOffset = $limit.' OFFSET '.$offset;
         }
 
         // Retrieve file records.
         $clause = 'storage > 0';
         if ($this->storage) {
-            $clause = 'storage = ' . $this->storage->getUid();
+            $clause = 'storage = '.$this->storage->getUid();
         }
 
         $query = $this->getDatabaseConnection()->SELECTquery('*', 'sys_file', $clause, '', '', $limitAndOffset);
@@ -164,7 +164,7 @@ 
     {
         $clause = 'storage > 0';
         if ($this->storage) {
-            $clause = 'storage = ' . $this->storage->getUid();
+            $clause = 'storage = '.$this->storage->getUid();
         }
         $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('count(*) AS totalNumberOfFiles', 'sys_file', $clause);
         return (int)$record['totalNumberOfFiles'];

Indentation +246 added lines, -246 removed lines

@@ -20,251 +20,251 @@
 class ThumbnailGenerator
 {
 
-    /**
-     * @var int
-     */
-    protected $numberOfTraversedFiles = 0;
-
-    /**
-     * @var int
-     */
-    protected $numberOfProcessedFiles = 0;
-
-    /**
-     * @var int
-     */
-    protected $numberOfMissingFiles = 0;
-
-    /**
-     * @var array
-     */
-    protected $configuration = [];
-
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage = null;
-
-    /**
-     * @var Selection
-     */
-    protected $selection = null;
-
-    /**
-     * @var array
-     */
-    protected $resultSet = [];
-
-    /**
-     * @var array
-     */
-    protected $newProcessedFileIdentifiers = [];
-
-    /**
-     * Internal variable
-     *
-     * @var int
-     */
-    protected $lastInsertedProcessedFile = 0;
-
-    /**
-     * Generate
-     *
-     * @param int $limit
-     * @param int $offset
-     * @return void
-     * @throws \TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException
-     * @throws \InvalidArgumentException
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @throws \Fab\Media\Exception\MissingTcaConfigurationException
-     */
-    public function generate($limit = 0, $offset = 0)
-    {
-
-        // Compute a possible limit and offset for the query.
-        $limitAndOffset = '';
-        if ($limit > 0 || $offset > 0) {
-            $limitAndOffset = $limit . ' OFFSET ' . $offset;
-        }
-
-        // Retrieve file records.
-        $clause = 'storage > 0';
-        if ($this->storage) {
-            $clause = 'storage = ' . $this->storage->getUid();
-        }
-
-        $query = $this->getDatabaseConnection()->SELECTquery('*', 'sys_file', $clause, '', '', $limitAndOffset);
-        $resource = $this->getDatabaseConnection()->sql_query($query);
-
-        while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
-
-            $file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
-
-            if ($file->exists()) {
-
-                $thumbnailUri = $this->getThumbnailService($file)
-                    ->setOutputType(ThumbnailInterface::OUTPUT_URI)
-                    ->setConfiguration($this->configuration)
-                    ->create();
-
-                $this->resultSet[$file->getUid()] = array(
-                    'fileUid' => $file->getUid(),
-                    'fileIdentifier' => $file->getIdentifier(),
-                    'thumbnailUri' => strpos($thumbnailUri, '_processed_') > 0 ? $thumbnailUri : '', // only returns the thumbnail uri if a processed file has been created.
-                );
-
-                if ($this->isNewProcessedFile()) {
-                    $this->incrementNumberOfProcessedFiles();
-                    $this->newProcessedFileIdentifiers[$file->getUid()] = $this->lastInsertedProcessedFile;
-                }
-
-                $this->incrementNumberOfTraversedFiles();
-            } else {
-                $this->incrementNumberOfMissingFiles();
-            }
-        }
-
-    }
-
-    /**
-     * @return int
-     */
-    protected function isNewProcessedFile()
-    {
-        $isNewProcessedFile = false;
-        $lastInsertedId = $this->getDatabaseConnection()->sql_insert_id();
-        if ($lastInsertedId > 0 && $lastInsertedId !== $this->lastInsertedProcessedFile) {
-            $this->lastInsertedProcessedFile = $lastInsertedId;
-            $isNewProcessedFile = true;
-        }
-        return $isNewProcessedFile;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfTraversedFiles()
-    {
-        return $this->numberOfTraversedFiles;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfProcessedFiles()
-    {
-        return $this->numberOfProcessedFiles;
-    }
-
-    /**
-     * @return int
-     */
-    public function getTotalNumberOfFiles()
-    {
-        $clause = 'storage > 0';
-        if ($this->storage) {
-            $clause = 'storage = ' . $this->storage->getUid();
-        }
-        $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('count(*) AS totalNumberOfFiles', 'sys_file', $clause);
-        return (int)$record['totalNumberOfFiles'];
-    }
-
-    /**
-     * @return array
-     */
-    public function getResultSet()
-    {
-        return $this->resultSet;
-    }
-
-    /**
-     * @return array
-     */
-    public function getNewProcessedFileIdentifiers()
-    {
-        return $this->newProcessedFileIdentifiers;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfMissingFiles()
-    {
-        return $this->numberOfMissingFiles;
-    }
-
-    /**
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return $this
-     */
-    public function setStorage($storage)
-    {
-        $this->storage = $storage;
-        return $this;
-    }
-
-    /**
-     * @param \Fab\Vidi\Domain\Model\Selection $selection
-     * @return $this
-     */
-    public function setSelection($selection)
-    {
-        $this->selection = $selection;
-        return $this;
-    }
-
-    /**
-     * @param array $configuration
-     * @return $this
-     */
-    public function setConfiguration($configuration)
-    {
-        $this->configuration = $configuration;
-        return $this;
-    }
-
-    /**
-     * @param File $file
-     * @return ThumbnailService
-     * @throws \InvalidArgumentException
-     */
-    protected function getThumbnailService(File $file)
-    {
-        return GeneralUtility::makeInstance(ThumbnailService::class, $file);
-    }
-
-    /**
-     * @return void
-     */
-    protected function incrementNumberOfTraversedFiles()
-    {
-        $this->numberOfTraversedFiles++;
-    }
-
-    /**
-     * @return void
-     */
-    protected function incrementNumberOfMissingFiles()
-    {
-        $this->numberOfMissingFiles++;
-    }
-
-    /**
-     * @return void
-     */
-    protected function incrementNumberOfProcessedFiles()
-    {
-        $this->numberOfProcessedFiles++;
-    }
-
-    /**
-     * Returns a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
+	/**
+	 * @var int
+	 */
+	protected $numberOfTraversedFiles = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $numberOfProcessedFiles = 0;
+
+	/**
+	 * @var int
+	 */
+	protected $numberOfMissingFiles = 0;
+
+	/**
+	 * @var array
+	 */
+	protected $configuration = [];
+
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage = null;
+
+	/**
+	 * @var Selection
+	 */
+	protected $selection = null;
+
+	/**
+	 * @var array
+	 */
+	protected $resultSet = [];
+
+	/**
+	 * @var array
+	 */
+	protected $newProcessedFileIdentifiers = [];
+
+	/**
+	 * Internal variable
+	 *
+	 * @var int
+	 */
+	protected $lastInsertedProcessedFile = 0;
+
+	/**
+	 * Generate
+	 *
+	 * @param int $limit
+	 * @param int $offset
+	 * @return void
+	 * @throws \TYPO3\CMS\Core\Resource\Exception\FileDoesNotExistException
+	 * @throws \InvalidArgumentException
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @throws \Fab\Media\Exception\MissingTcaConfigurationException
+	 */
+	public function generate($limit = 0, $offset = 0)
+	{
+
+		// Compute a possible limit and offset for the query.
+		$limitAndOffset = '';
+		if ($limit > 0 || $offset > 0) {
+			$limitAndOffset = $limit . ' OFFSET ' . $offset;
+		}
+
+		// Retrieve file records.
+		$clause = 'storage > 0';
+		if ($this->storage) {
+			$clause = 'storage = ' . $this->storage->getUid();
+		}
+
+		$query = $this->getDatabaseConnection()->SELECTquery('*', 'sys_file', $clause, '', '', $limitAndOffset);
+		$resource = $this->getDatabaseConnection()->sql_query($query);
+
+		while ($row = $this->getDatabaseConnection()->sql_fetch_assoc($resource)) {
+
+			$file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
+
+			if ($file->exists()) {
+
+				$thumbnailUri = $this->getThumbnailService($file)
+					->setOutputType(ThumbnailInterface::OUTPUT_URI)
+					->setConfiguration($this->configuration)
+					->create();
+
+				$this->resultSet[$file->getUid()] = array(
+					'fileUid' => $file->getUid(),
+					'fileIdentifier' => $file->getIdentifier(),
+					'thumbnailUri' => strpos($thumbnailUri, '_processed_') > 0 ? $thumbnailUri : '', // only returns the thumbnail uri if a processed file has been created.
+				);
+
+				if ($this->isNewProcessedFile()) {
+					$this->incrementNumberOfProcessedFiles();
+					$this->newProcessedFileIdentifiers[$file->getUid()] = $this->lastInsertedProcessedFile;
+				}
+
+				$this->incrementNumberOfTraversedFiles();
+			} else {
+				$this->incrementNumberOfMissingFiles();
+			}
+		}
+
+	}
+
+	/**
+	 * @return int
+	 */
+	protected function isNewProcessedFile()
+	{
+		$isNewProcessedFile = false;
+		$lastInsertedId = $this->getDatabaseConnection()->sql_insert_id();
+		if ($lastInsertedId > 0 && $lastInsertedId !== $this->lastInsertedProcessedFile) {
+			$this->lastInsertedProcessedFile = $lastInsertedId;
+			$isNewProcessedFile = true;
+		}
+		return $isNewProcessedFile;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfTraversedFiles()
+	{
+		return $this->numberOfTraversedFiles;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfProcessedFiles()
+	{
+		return $this->numberOfProcessedFiles;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTotalNumberOfFiles()
+	{
+		$clause = 'storage > 0';
+		if ($this->storage) {
+			$clause = 'storage = ' . $this->storage->getUid();
+		}
+		$record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('count(*) AS totalNumberOfFiles', 'sys_file', $clause);
+		return (int)$record['totalNumberOfFiles'];
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getResultSet()
+	{
+		return $this->resultSet;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getNewProcessedFileIdentifiers()
+	{
+		return $this->newProcessedFileIdentifiers;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfMissingFiles()
+	{
+		return $this->numberOfMissingFiles;
+	}
+
+	/**
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return $this
+	 */
+	public function setStorage($storage)
+	{
+		$this->storage = $storage;
+		return $this;
+	}
+
+	/**
+	 * @param \Fab\Vidi\Domain\Model\Selection $selection
+	 * @return $this
+	 */
+	public function setSelection($selection)
+	{
+		$this->selection = $selection;
+		return $this;
+	}
+
+	/**
+	 * @param array $configuration
+	 * @return $this
+	 */
+	public function setConfiguration($configuration)
+	{
+		$this->configuration = $configuration;
+		return $this;
+	}
+
+	/**
+	 * @param File $file
+	 * @return ThumbnailService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getThumbnailService(File $file)
+	{
+		return GeneralUtility::makeInstance(ThumbnailService::class, $file);
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function incrementNumberOfTraversedFiles()
+	{
+		$this->numberOfTraversedFiles++;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function incrementNumberOfMissingFiles()
+	{
+		$this->numberOfMissingFiles++;
+	}
+
+	/**
+	 * @return void
+	 */
+	protected function incrementNumberOfProcessedFiles()
+	{
+		$this->numberOfProcessedFiles++;
+	}
+
+	/**
+	 * Returns a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
 
 }

Classes/Thumbnail/AbstractThumbnailProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
     public function prefixUri($uri)
     {
         if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
-            $uri = $this->getFrontendObject()->absRefPrefix . $uri;
+            $uri = $this->getFrontendObject()->absRefPrefix.$uri;
         }
         return $uri;
     }

Indentation +151 added lines, -151 removed lines

@@ -19,155 +19,155 @@
 abstract class AbstractThumbnailProcessor implements ThumbnailProcessorInterface
 {
 
-    /**
-     * @var ThumbnailService
-     */
-    protected $thumbnailService;
-
-    /**
-     * Store a Processed File along the processing.
-     *
-     * @var \TYPO3\CMS\Core\Resource\ProcessedFile
-     */
-    protected $processedFile;
-
-    /**
-     * Define what are the rendering steps for a thumbnail.
-     *
-     * @var array
-     */
-    protected $renderingSteps = [
-        ThumbnailInterface::OUTPUT_URI => 'renderUri',
-        ThumbnailInterface::OUTPUT_IMAGE => 'renderTagImage',
-        ThumbnailInterface::OUTPUT_IMAGE_WRAPPED => 'renderTagAnchor',
-    ];
-
-    /**
-     * @param ThumbnailService $thumbnailService
-     * @return $this
-     */
-    public function setThumbnailService(ThumbnailService $thumbnailService)
-    {
-        $this->thumbnailService = $thumbnailService;
-        return $this;
-    }
-
-    /**
-     * Return what needs to be rendered
-     *
-     * @return array
-     */
-    protected function getRenderingSteps()
-    {
-        $position = array_search($this->thumbnailService->getOutputType(), array_keys($this->renderingSteps));
-        return array_slice($this->renderingSteps, 0, $position + 1);
-    }
-
-
-    /**
-     * Render additional attribute for this DOM element.
-     *
-     * @return string
-     */
-    protected function renderAttributes()
-    {
-        $result = '';
-        $attributes = $this->thumbnailService->getAttributes();
-        if (is_array($attributes)) {
-            foreach ($attributes as $attribute => $value) {
-                $result .= sprintf('%s="%s" ',
-                    htmlspecialchars($attribute),
-                    htmlspecialchars($value)
-                );
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * @return array
-     * @throws \Fab\Media\Exception\InvalidKeyInArrayException
-     * @throws \Fab\Media\Exception\EmptyValueException
-     */
-    protected function getConfiguration()
-    {
-        $configuration = $this->thumbnailService->getConfiguration();
-        if (!$configuration) {
-            $dimension = ImagePresetUtility::getInstance()->preset('image_thumbnail');
-            $configuration = array(
-                'width' => $dimension->getWidth(),
-                'height' => $dimension->getHeight(),
-            );
-        }
-        return $configuration;
-    }
-
-    /**
-     * Returns a path to an icon given an extension.
-     *
-     * @param string $extension File extension
-     * @return string
-     */
-    protected function getIcon($extension)
-    {
-        $resource = Path::getRelativePath(sprintf('Icons/MimeType/%s.png', $extension));
-
-        // If file is not found, fall back to a default icon
-        if (Path::notExists($resource)) {
-            $resource = Path::getRelativePath('Icons/MissingMimeTypeIcon.png');
-        }
-
-        return $resource;
-    }
-
-    /**
-     * @param string $uri
-     * @return string
-     */
-    public function prefixUri($uri)
-    {
-        if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
-            $uri = $this->getFrontendObject()->absRefPrefix . $uri;
-        }
-        return $uri;
-    }
-
-    /**
-     * Returns true whether an thumbnail can be generated
-     *
-     * @param string $extension File extension
-     * @return boolean
-     */
-    protected function isThumbnailPossible($extension)
-    {
-        return GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], strtolower($extension));
-    }
-
-    /**
-     * @return File
-     */
-    protected function getFile()
-    {
-        return $this->thumbnailService->getFile();
-    }
-
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return bool
-     */
-    protected function isFrontendMode()
-    {
-        return TYPO3_MODE === 'FE';
-    }
-
-    /**
-     * Returns an instance of the Frontend object.
-     *
-     * @return \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
-     */
-    protected function getFrontendObject()
-    {
-        return $GLOBALS['TSFE'];
-    }
+	/**
+	 * @var ThumbnailService
+	 */
+	protected $thumbnailService;
+
+	/**
+	 * Store a Processed File along the processing.
+	 *
+	 * @var \TYPO3\CMS\Core\Resource\ProcessedFile
+	 */
+	protected $processedFile;
+
+	/**
+	 * Define what are the rendering steps for a thumbnail.
+	 *
+	 * @var array
+	 */
+	protected $renderingSteps = [
+		ThumbnailInterface::OUTPUT_URI => 'renderUri',
+		ThumbnailInterface::OUTPUT_IMAGE => 'renderTagImage',
+		ThumbnailInterface::OUTPUT_IMAGE_WRAPPED => 'renderTagAnchor',
+	];
+
+	/**
+	 * @param ThumbnailService $thumbnailService
+	 * @return $this
+	 */
+	public function setThumbnailService(ThumbnailService $thumbnailService)
+	{
+		$this->thumbnailService = $thumbnailService;
+		return $this;
+	}
+
+	/**
+	 * Return what needs to be rendered
+	 *
+	 * @return array
+	 */
+	protected function getRenderingSteps()
+	{
+		$position = array_search($this->thumbnailService->getOutputType(), array_keys($this->renderingSteps));
+		return array_slice($this->renderingSteps, 0, $position + 1);
+	}
+
+
+	/**
+	 * Render additional attribute for this DOM element.
+	 *
+	 * @return string
+	 */
+	protected function renderAttributes()
+	{
+		$result = '';
+		$attributes = $this->thumbnailService->getAttributes();
+		if (is_array($attributes)) {
+			foreach ($attributes as $attribute => $value) {
+				$result .= sprintf('%s="%s" ',
+					htmlspecialchars($attribute),
+					htmlspecialchars($value)
+				);
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * @return array
+	 * @throws \Fab\Media\Exception\InvalidKeyInArrayException
+	 * @throws \Fab\Media\Exception\EmptyValueException
+	 */
+	protected function getConfiguration()
+	{
+		$configuration = $this->thumbnailService->getConfiguration();
+		if (!$configuration) {
+			$dimension = ImagePresetUtility::getInstance()->preset('image_thumbnail');
+			$configuration = array(
+				'width' => $dimension->getWidth(),
+				'height' => $dimension->getHeight(),
+			);
+		}
+		return $configuration;
+	}
+
+	/**
+	 * Returns a path to an icon given an extension.
+	 *
+	 * @param string $extension File extension
+	 * @return string
+	 */
+	protected function getIcon($extension)
+	{
+		$resource = Path::getRelativePath(sprintf('Icons/MimeType/%s.png', $extension));
+
+		// If file is not found, fall back to a default icon
+		if (Path::notExists($resource)) {
+			$resource = Path::getRelativePath('Icons/MissingMimeTypeIcon.png');
+		}
+
+		return $resource;
+	}
+
+	/**
+	 * @param string $uri
+	 * @return string
+	 */
+	public function prefixUri($uri)
+	{
+		if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
+			$uri = $this->getFrontendObject()->absRefPrefix . $uri;
+		}
+		return $uri;
+	}
+
+	/**
+	 * Returns true whether an thumbnail can be generated
+	 *
+	 * @param string $extension File extension
+	 * @return boolean
+	 */
+	protected function isThumbnailPossible($extension)
+	{
+		return GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], strtolower($extension));
+	}
+
+	/**
+	 * @return File
+	 */
+	protected function getFile()
+	{
+		return $this->thumbnailService->getFile();
+	}
+
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return bool
+	 */
+	protected function isFrontendMode()
+	{
+		return TYPO3_MODE === 'FE';
+	}
+
+	/**
+	 * Returns an instance of the Frontend object.
+	 *
+	 * @return \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController
+	 */
+	protected function getFrontendObject()
+	{
+		return $GLOBALS['TSFE'];
+	}
 }

Classes/Thumbnail/ImageThumbnailProcessor.php

Spacing +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
 
         return sprintf('<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->processedFile->getProperty('tstamp') : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()
@@ -146,7 +146,7 @@ 
 
         return sprintf('<a href="%s%s" target="%s" data-uid="%s">%s</a>',
             $url,
-            $this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator.$file->getProperty('tstamp') : '',
             $this->thumbnailService->getTarget(),
             $file->getUid(),
             $result

Indentation +175 added lines, -175 removed lines

@@ -16,180 +16,180 @@
 class ImageThumbnailProcessor extends AbstractThumbnailProcessor
 {
 
-    /**
-     * @var array
-     */
-    protected $defaultConfigurationWrap = array(
-        'width' => 0,
-        'height' => 0,
-    );
-
-    /**
-     * Render a thumbnail of a resource of type image.
-     *
-     * @return string
-     */
-    public function create()
-    {
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     * @throws \Fab\Media\Exception\EmptyValueException
-     */
-    public function renderUri()
-    {
-
-        // Makes sure the width and the height of the thumbnail is not bigger than the actual file
-        $configuration = $this->getConfiguration();
-        if (!empty($configuration['width']) && $configuration['width'] > $this->getFile()->getProperty('width')) {
-            $configuration['width'] = $this->getFile()->getProperty('width');
-        }
-        if (!empty($configuration['height']) && $configuration['height'] > $this->getFile()->getProperty('height')) {
-            $configuration['height'] = $this->getFile()->getProperty('height');
-        }
-
-        $configuration = $this->computeFinalImageDimension($configuration);
-        $this->processedFile = $this->getFile()->process($this->getProcessingType(), $configuration);
-        $uri = $this->processedFile->getPublicUrl(true);
-
-        // Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
-        if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
-            $this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
-        }
-
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result)
-    {
-
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf('<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the title of the file.
-     *
-     * @return string
-     */
-    protected function getTitle()
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (!$result) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result)
-    {
-
-        $file = $this->getFile();
-
-        // Perhaps the wrapping file must be processed
-        $configurationWrap = $this->thumbnailService->getConfigurationWrap();
-
-        // Make sure we have configurationWrap initialized correctly
-        if (!empty($configurationWrap['width']) || !empty($configurationWrap['height'])) {
-            $configurationWrap = array_merge($this->defaultConfigurationWrap, $configurationWrap);
-
-            // It looks maxW or maxH does not work as expected with CONTEXT_IMAGEPREVIEW...
-            // ... uses "width" and "height" instead.
-            if ($configurationWrap['width'] < $this->getFile()->getProperty('width')
-                || $configurationWrap['height'] < $this->getFile()->getProperty('height')
-            ) {
-                $configurationWrap = $this->computeFinalImageDimension($configurationWrap);
-                $file = $this->getFile()->process($this->getProcessingType(), $configurationWrap);
-            }
-        }
-
-        // Analyse the current $url and compute the adequate separator between arguments.
-        $url = $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true);
-        $parameterSeparator = strpos($url, '?') === false ? '?' : '&';
-
-        return sprintf('<a href="%s%s" target="%s" data-uid="%s">%s</a>',
-            $url,
-            $this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
-            $this->thumbnailService->getTarget(),
-            $file->getUid(),
-            $result
-        );
-    }
-
-    /**
-     * Compute the final configuration for the image preview.
-     * Keep ratio of width / height for the image.
-     *
-     * @param array $configuration
-     * @return array
-     */
-    protected function computeFinalImageDimension(array $configuration)
-    {
-        $ratio = $this->computeImageRatio();
-
-        if ($ratio > 1) {
-            $configuration['height'] = round($configuration['width'] / $ratio);
-        } else {
-            $configuration['width'] = round($configuration['height'] * $ratio);
-        }
-        return $configuration;
-    }
-
-    /**
-     * Compute the width / height ratio of the image.
-     *
-     * @return null|float
-     */
-    protected function computeImageRatio()
-    {
-        $ratio = null;
-        if ($this->getFile()->getProperty('width') > 0 && $this->getFile()->getProperty('height') > 0) {
-            $ratio = $this->getFile()->getProperty('width') / $this->getFile()->getProperty('height');
-        }
-        return $ratio;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProcessingType()
-    {
-        if ($this->thumbnailService->getProcessingType() === null) {
-            return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
-        }
-        return $this->thumbnailService->getProcessingType();
-    }
+	/**
+	 * @var array
+	 */
+	protected $defaultConfigurationWrap = array(
+		'width' => 0,
+		'height' => 0,
+	);
+
+	/**
+	 * Render a thumbnail of a resource of type image.
+	 *
+	 * @return string
+	 */
+	public function create()
+	{
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 * @throws \Fab\Media\Exception\EmptyValueException
+	 */
+	public function renderUri()
+	{
+
+		// Makes sure the width and the height of the thumbnail is not bigger than the actual file
+		$configuration = $this->getConfiguration();
+		if (!empty($configuration['width']) && $configuration['width'] > $this->getFile()->getProperty('width')) {
+			$configuration['width'] = $this->getFile()->getProperty('width');
+		}
+		if (!empty($configuration['height']) && $configuration['height'] > $this->getFile()->getProperty('height')) {
+			$configuration['height'] = $this->getFile()->getProperty('height');
+		}
+
+		$configuration = $this->computeFinalImageDimension($configuration);
+		$this->processedFile = $this->getFile()->process($this->getProcessingType(), $configuration);
+		$uri = $this->processedFile->getPublicUrl(true);
+
+		// Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
+		if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
+			$this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
+		}
+
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result)
+	{
+
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf('<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 *
+	 * @return string
+	 */
+	protected function getTitle()
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (!$result) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result)
+	{
+
+		$file = $this->getFile();
+
+		// Perhaps the wrapping file must be processed
+		$configurationWrap = $this->thumbnailService->getConfigurationWrap();
+
+		// Make sure we have configurationWrap initialized correctly
+		if (!empty($configurationWrap['width']) || !empty($configurationWrap['height'])) {
+			$configurationWrap = array_merge($this->defaultConfigurationWrap, $configurationWrap);
+
+			// It looks maxW or maxH does not work as expected with CONTEXT_IMAGEPREVIEW...
+			// ... uses "width" and "height" instead.
+			if ($configurationWrap['width'] < $this->getFile()->getProperty('width')
+				|| $configurationWrap['height'] < $this->getFile()->getProperty('height')
+			) {
+				$configurationWrap = $this->computeFinalImageDimension($configurationWrap);
+				$file = $this->getFile()->process($this->getProcessingType(), $configurationWrap);
+			}
+		}
+
+		// Analyse the current $url and compute the adequate separator between arguments.
+		$url = $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true);
+		$parameterSeparator = strpos($url, '?') === false ? '?' : '&';
+
+		return sprintf('<a href="%s%s" target="%s" data-uid="%s">%s</a>',
+			$url,
+			$this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
+			$this->thumbnailService->getTarget(),
+			$file->getUid(),
+			$result
+		);
+	}
+
+	/**
+	 * Compute the final configuration for the image preview.
+	 * Keep ratio of width / height for the image.
+	 *
+	 * @param array $configuration
+	 * @return array
+	 */
+	protected function computeFinalImageDimension(array $configuration)
+	{
+		$ratio = $this->computeImageRatio();
+
+		if ($ratio > 1) {
+			$configuration['height'] = round($configuration['width'] / $ratio);
+		} else {
+			$configuration['width'] = round($configuration['height'] * $ratio);
+		}
+		return $configuration;
+	}
+
+	/**
+	 * Compute the width / height ratio of the image.
+	 *
+	 * @return null|float
+	 */
+	protected function computeImageRatio()
+	{
+		$ratio = null;
+		if ($this->getFile()->getProperty('width') > 0 && $this->getFile()->getProperty('height') > 0) {
+			$ratio = $this->getFile()->getProperty('width') / $this->getFile()->getProperty('height');
+		}
+		return $ratio;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getProcessingType()
+	{
+		if ($this->thumbnailService->getProcessingType() === null) {
+			return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
+		}
+		return $this->thumbnailService->getProcessingType();
+	}
 
 }

Classes/ViewHelpers/Form/FooterViewHelper.php

Spacing +6 added lines, -6 removed lines

@@ -56,7 +56,7 @@ 
             $file->getProperty('crdate') ? $this->formatDate($arguments, $file->getProperty('crdate')) : '',
             $this->getUserName($file->getProperty('cruser_id')),
             LocalizationUtility::translate('updated_on', 'media'),
-            $file->getProperty('tstamp') ? $this->formatDate($arguments, '@' . $file->getProperty('tstamp')) : '',
+            $file->getProperty('tstamp') ? $this->formatDate($arguments, '@'.$file->getProperty('tstamp')) : '',
             $this->getUserName($file->getProperty('upuser_id'))
         );
 
@@ -76,7 +76,7 @@ 
         $username = '';
 
         if ($userIdentifier > 0) {
-            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'be_users', 'uid = ' . $userIdentifier);
+            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'be_users', 'uid = '.$userIdentifier);
             $username = sprintf('%s %s',
                 LocalizationUtility::translate('by', 'media'),
                 empty($record['realName']) ? $record['username'] : $record['realName']
@@ -126,12 +126,12 @@ 
 
         if (!$date instanceof \DateTimeInterface) {
             try {
-                $base = $base instanceof \DateTimeInterface ? $base->format('U') : strtotime((MathUtility::canBeInterpretedAsInteger($base) ? '@' : '') . $base);
-                $dateTimestamp = strtotime((MathUtility::canBeInterpretedAsInteger($date) ? '@' : '') . $date, $base);
-                $date = new \DateTime('@' . $dateTimestamp);
+                $base = $base instanceof \DateTimeInterface ? $base->format('U') : strtotime((MathUtility::canBeInterpretedAsInteger($base) ? '@' : '').$base);
+                $dateTimestamp = strtotime((MathUtility::canBeInterpretedAsInteger($date) ? '@' : '').$date, $base);
+                $date = new \DateTime('@'.$dateTimestamp);
                 $date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
             } catch (\Exception $exception) {
-                throw new Exception('"' . $date . '" could not be parsed by \DateTime constructor: ' . $exception->getMessage(), 1241722579);
+                throw new Exception('"'.$date.'" could not be parsed by \DateTime constructor: '.$exception->getMessage(), 1241722579);
             }
         }
 

Indentation +115 added lines, -115 removed lines

@@ -20,119 +20,119 @@
 class FooterViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Render a form footer.
-     * Example:
-     * Created on 30-12-12 by John Updated on 22-05-12 by Jane
-     *
-     * @return string
-     */
-    public function render()
-    {
-
-        /** @var File $file */
-        $file = $this->templateVariableContainer->get('file');
-        $template = '<span>%s %s %s</span> <span style="padding-left: 50px">%s %s %s</span>';
-
-        $format = sprintf('%s @ %s',
-            $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'],
-            $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm']
-        );
-
-        $arguments = array(
-            'date' => null,
-            'format' => $format,
-            'base' => null
-        );
-
-        $result = sprintf($template,
-            LocalizationUtility::translate('created_on', 'media'),
-            $file->getProperty('crdate') ? $this->formatDate($arguments, $file->getProperty('crdate')) : '',
-            $this->getUserName($file->getProperty('cruser_id')),
-            LocalizationUtility::translate('updated_on', 'media'),
-            $file->getProperty('tstamp') ? $this->formatDate($arguments, '@' . $file->getProperty('tstamp')) : '',
-            $this->getUserName($file->getProperty('upuser_id'))
-        );
-
-        return $result;
-    }
-
-
-    /**
-     * Get the User name to be displayed
-     *
-     * @param int $userIdentifier
-     * @return string
-     */
-    public function getUserName($userIdentifier)
-    {
-
-        $username = '';
-
-        if ($userIdentifier > 0) {
-            $record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'be_users', 'uid = ' . $userIdentifier);
-            $username = sprintf('%s %s',
-                LocalizationUtility::translate('by', 'media'),
-                empty($record['realName']) ? $record['username'] : $record['realName']
-            );
-        }
-
-        return $username;
-    }
-
-
-    /**
-     * Returns a pointer to the database.
-     *
-     * @return \Fab\Vidi\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
-
-
-    /**
-     * @param array $arguments
-     * @param int|string $date
-     * @return string
-     * @throws Exception
-     */
-    public function formatDate(array $arguments, $date)
-    {
-        $format = $arguments['format'];
-        $base = $date;
-        if (is_string($base)) {
-            $base = trim($base);
-        }
-
-        if ($format === '') {
-            $format = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] ?: 'Y-m-d';
-        }
-
-        if (is_string($date)) {
-            $date = trim($date);
-        }
-
-        if ($date === '') {
-            $date = 'now';
-        }
-
-        if (!$date instanceof \DateTimeInterface) {
-            try {
-                $base = $base instanceof \DateTimeInterface ? $base->format('U') : strtotime((MathUtility::canBeInterpretedAsInteger($base) ? '@' : '') . $base);
-                $dateTimestamp = strtotime((MathUtility::canBeInterpretedAsInteger($date) ? '@' : '') . $date, $base);
-                $date = new \DateTime('@' . $dateTimestamp);
-                $date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
-            } catch (\Exception $exception) {
-                throw new Exception('"' . $date . '" could not be parsed by \DateTime constructor: ' . $exception->getMessage(), 1241722579);
-            }
-        }
-
-        if (strpos($format, '%') !== false) {
-            return strftime($format, $date->format('U'));
-        } else {
-            return $date->format($format);
-        }
-    }
+	/**
+	 * Render a form footer.
+	 * Example:
+	 * Created on 30-12-12 by John Updated on 22-05-12 by Jane
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+
+		/** @var File $file */
+		$file = $this->templateVariableContainer->get('file');
+		$template = '<span>%s %s %s</span> <span style="padding-left: 50px">%s %s %s</span>';
+
+		$format = sprintf('%s @ %s',
+			$GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'],
+			$GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm']
+		);
+
+		$arguments = array(
+			'date' => null,
+			'format' => $format,
+			'base' => null
+		);
+
+		$result = sprintf($template,
+			LocalizationUtility::translate('created_on', 'media'),
+			$file->getProperty('crdate') ? $this->formatDate($arguments, $file->getProperty('crdate')) : '',
+			$this->getUserName($file->getProperty('cruser_id')),
+			LocalizationUtility::translate('updated_on', 'media'),
+			$file->getProperty('tstamp') ? $this->formatDate($arguments, '@' . $file->getProperty('tstamp')) : '',
+			$this->getUserName($file->getProperty('upuser_id'))
+		);
+
+		return $result;
+	}
+
+
+	/**
+	 * Get the User name to be displayed
+	 *
+	 * @param int $userIdentifier
+	 * @return string
+	 */
+	public function getUserName($userIdentifier)
+	{
+
+		$username = '';
+
+		if ($userIdentifier > 0) {
+			$record = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('*', 'be_users', 'uid = ' . $userIdentifier);
+			$username = sprintf('%s %s',
+				LocalizationUtility::translate('by', 'media'),
+				empty($record['realName']) ? $record['username'] : $record['realName']
+			);
+		}
+
+		return $username;
+	}
+
+
+	/**
+	 * Returns a pointer to the database.
+	 *
+	 * @return \Fab\Vidi\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
+
+
+	/**
+	 * @param array $arguments
+	 * @param int|string $date
+	 * @return string
+	 * @throws Exception
+	 */
+	public function formatDate(array $arguments, $date)
+	{
+		$format = $arguments['format'];
+		$base = $date;
+		if (is_string($base)) {
+			$base = trim($base);
+		}
+
+		if ($format === '') {
+			$format = $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] ?: 'Y-m-d';
+		}
+
+		if (is_string($date)) {
+			$date = trim($date);
+		}
+
+		if ($date === '') {
+			$date = 'now';
+		}
+
+		if (!$date instanceof \DateTimeInterface) {
+			try {
+				$base = $base instanceof \DateTimeInterface ? $base->format('U') : strtotime((MathUtility::canBeInterpretedAsInteger($base) ? '@' : '') . $base);
+				$dateTimestamp = strtotime((MathUtility::canBeInterpretedAsInteger($date) ? '@' : '') . $date, $base);
+				$date = new \DateTime('@' . $dateTimestamp);
+				$date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
+			} catch (\Exception $exception) {
+				throw new Exception('"' . $date . '" could not be parsed by \DateTime constructor: ' . $exception->getMessage(), 1241722579);
+			}
+		}
+
+		if (strpos($format, '%') !== false) {
+			return strftime($format, $date->format('U'));
+		} else {
+			return $date->format($format);
+		}
+	}
 }

Classes/Grid/ActionPermissionColumn.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             $permission .= 'W';
         }
 
-        return '<strong>' . $permission . '</strong>';
+        return '<strong>'.$permission.'</strong>';
     }
 
     /**

Indentation +29 added lines, -29 removed lines

@@ -17,34 +17,34 @@
 class ActionPermissionColumn extends ColumnRendererAbstract
 {
 
-    /**
-     * Renders a configurable metadata property of a file in the Grid.
-     *
-     * @throws \Exception
-     * @return string
-     */
-    public function render()
-    {
-
-        $file = $this->getFileConverter()->convert($this->object);
-        $permission = '';
-
-        if ($file->checkActionPermission('read')) {
-            $permission = 'R';
-        }
-        if ($file->checkActionPermission('write')) {
-            $permission .= 'W';
-        }
-
-        return '<strong>' . $permission . '</strong>';
-    }
-
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * Renders a configurable metadata property of a file in the Grid.
+	 *
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function render()
+	{
+
+		$file = $this->getFileConverter()->convert($this->object);
+		$permission = '';
+
+		if ($file->checkActionPermission('read')) {
+			$permission = 'R';
+		}
+		if ($file->checkActionPermission('write')) {
+			$permission .= 'W';
+		}
+
+		return '<strong>' . $permission . '</strong>';
+	}
+
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 
 }