fabarea / media

Classes/Thumbnail/AudioThumbnailProcessor.php

Indentation +72 added lines, -72 removed lines

@@ -17,85 +17,85 @@
  */
 class AudioThumbnailProcessor extends AbstractThumbnailProcessor
 {
-    /**
-     * Render a thumbnail of a resource of type audio.
-     */
-    public function create(): string
-    {
-        $steps = $this->getRenderingSteps();
+	/**
+	 * Render a thumbnail of a resource of type audio.
+	 */
+	public function create(): string
+	{
+		$steps = $this->getRenderingSteps();
 
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Render the URI of the thumbnail.
-     */
-    public function renderUri(): string
-    {
-        $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
-        if (!file_exists($fileNameAndPath)) {
-            $relativePath = 'Icons/UnknownMimeType.png';
-        }
+	/**
+	 * Render the URI of the thumbnail.
+	 */
+	public function renderUri(): string
+	{
+		$relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
+		$fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+		if (!file_exists($fileNameAndPath)) {
+			$relativePath = 'Icons/UnknownMimeType.png';
+		}
 
-        $uri = Path::getRelativePath($relativePath);
-        return $this->prefixUri($uri);
-    }
+		$uri = Path::getRelativePath($relativePath);
+		return $this->prefixUri($uri);
+	}
 
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagImage($result): string
-    {
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagImage($result): string
+	{
+		// 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->getFile()->getProperty('tstamp') : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
 
-    /**
-     * Compute and return the title of the file.
-     */
-    protected function getTitle(): string
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (!$result) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
+	/**
+	 * Compute and return the title of the file.
+	 */
+	protected function getTitle(): string
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (!$result) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
 
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagAnchor($result): string
-    {
-        $file = $this->getFile();
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagAnchor($result): string
+	{
+		$file = $this->getFile();
 
-        return sprintf(
-            '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
-            $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
-            $this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
-            $this->thumbnailService->getTarget(),
-            $file->getUid(),
-            $result
-        );
-    }
+		return sprintf(
+			'<a href="%s%s" target="%s" data-uid="%s">%s</a>',
+			$this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
+			$this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
+			$this->thumbnailService->getTarget(),
+			$file->getUid(),
+			$result
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
     public function renderUri(): string
     {
         $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/'.$relativePath);
         if (!file_exists($fileNameAndPath)) {
             $relativePath = 'Icons/UnknownMimeType.png';
         }
@@ -61,7 +61,7 @@ 
         return sprintf(
             '<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->getFile()->getProperty('tstamp') : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()
@@ -92,7 +92,7 @@ 
         return sprintf(
             '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
             $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
-            $this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? '?'.$file->getProperty('tstamp') : '',
             $this->thumbnailService->getTarget(),
             $file->getUid(),
             $result

Classes/Facet/ActionPermissionFacet.php

Indentation +237 added lines, -237 removed lines

@@ -23,241 +23,241 @@
  */
 class ActionPermissionFacet implements FacetInterface
 {
-    /**
-     * @var string
-     */
-    protected $name = '__action_permission';
-
-    /**
-     * @var string
-     */
-    protected $label = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:permission';
-
-    /**
-     * @var array
-     */
-    protected $suggestions = array(
-        'r' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.read_only',
-        'w' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.write',
-    );
-
-    /**
-     * @var string
-     */
-    protected $fieldNameAndPath = '';
-
-    /**
-     * @var string
-     */
-    protected $dataType;
-
-    /**
-     * @var bool
-     */
-    protected $canModifyMatcher = false;
-
-    /**
-     * Constructor of a Generic Facet in Vidi.
-     *
-     * @param string $name
-     * @param string $label
-     * @param array $suggestions
-     * @param string $fieldNameAndPath
-     */
-    public function __construct($name = '', $label = '', array $suggestions = [], $fieldNameAndPath = '')
-    {
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getLabel()
-    {
-        return $this->getLanguageService()->sL($this->label);
-    }
-
-    /**
-     * @return array
-     */
-    public function getSuggestions()
-    {
-        $suggestions = [];
-        foreach ($this->suggestions as $key => $label) {
-            $suggestions[] = array($key => $this->getLanguageService()->sL($label));
-        }
-
-        return $suggestions;
-    }
-
-    /**
-     * @return bool
-     */
-    public function hasSuggestions()
-    {
-        return true;
-    }
-
-    /**
-     * @param string $dataType
-     * @return $this
-     */
-    public function setDataType($dataType)
-    {
-        $this->dataType = $dataType;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function canModifyMatcher()
-    {
-        return $this->canModifyMatcher;
-    }
-
-    /**
-     * @param Matcher $matcher
-     * @param $value
-     * @return Matcher
-     */
-    public function modifyMatcher(Matcher $matcher, $value)
-    {
-        return $matcher;
-    }
-
-    /**
-     * @param AfterFindContentObjectsSignalArguments $signalArguments
-     * @return array
-     */
-    public function modifyResultSet(AfterFindContentObjectsSignalArguments $signalArguments)
-    {
-        if ($signalArguments->getDataType() === 'sys_file') {
-            $queryParts = $this->getQueryParts();
-
-            if (!empty($queryParts)) {
-                $permission = $this->getPermissionValue($queryParts);
-
-                if ($permission) {
-                    // We are force to query the content repository again here without limit
-                    $matcher = $signalArguments->getMatcher();
-                    $order = $signalArguments->getOrder();
-                    $objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order);
-
-                    $filteredObjects = [];
-                    foreach ($objects as $object) {
-                        $file = $this->getFileConverter()->convert($object->getUid());
-                        if ($permission === 'read' && !$file->checkActionPermission('write')) {
-                            $filteredObjects[] = $object;
-                        } elseif ($permission === 'write' && $file->checkActionPermission('write')) {
-                            $filteredObjects[] = $object;
-                        }
-                    }
-
-                    // Only take part of the array according to offset and limit.
-                    $offset = $signalArguments->getOffset();
-                    $limit = $signalArguments->getLimit();
-                    $signalArguments->setContentObjects(array_slice($filteredObjects, $offset, $limit));
-
-                    // Count number of records
-                    $signalArguments->setNumberOfObjects(count($filteredObjects));
-                    $signalArguments->setHasBeenProcessed(true);
-                }
-            }
-        }
-
-        return array($signalArguments);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getQueryParts()
-    {
-        // Transmit recursive selection parameter.
-        $parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
-        $parameters = GeneralUtility::_GP($parameterPrefix);
-
-        $queryParts = [];
-        if (!empty($parameters['searchTerm'])) {
-            $query = rawurldecode($parameters['searchTerm']);
-            $queryParts = json_decode($query, true);
-        }
-
-        return $queryParts;
-    }
-
-    /**
-     * Retrieve the search permission value.
-     *
-     * @param array $queryParts
-     * @return string
-     */
-    protected function getPermissionValue(array $queryParts)
-    {
-        $permission = '';
-
-        // Check also amongst labels.
-        $labelReadOnly = $this->getLanguageService()->sL($this->suggestions['r']);
-        $labelWrite = $this->getLanguageService()->sL($this->suggestions['w']);
-
-        foreach ($queryParts as $queryPart) {
-            $facetName = key($queryPart);
-            $value = $queryPart[$facetName];
-            if ($facetName === $this->name) {
-                if ($value === 'r' || $value === $labelReadOnly) {
-                    $permission = 'read';
-                } elseif ($value === 'w' || $value === $labelWrite) {
-                    $permission = 'write';
-                }
-            }
-        }
-        return $permission;
-    }
-
-    /**
-     * Magic method implementation for retrieving state.
-     *
-     * @param array $states
-     * @return $this
-     */
-    public static function __set_state($states)
-    {
-        return new ActionPermissionFacet($states['name'], $states['label'], $states['suggestions'], $states['fieldNameAndPath']);
-    }
-
-    /**
-     * @return LanguageService
-     */
-    protected function getLanguageService()
-    {
-        return $GLOBALS['LANG'];
-    }
-
-    /**
-     * @return ContentToFileConverter
-     * @throws \InvalidArgumentException
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(ContentToFileConverter::class);
-    }
-
-    /**
-     * Get the Vidi Module Loader.
-     *
-     * @return ModuleLoader
-     * @throws \InvalidArgumentException
-     */
-    protected function getModuleLoader()
-    {
-        return GeneralUtility::makeInstance(ModuleLoader::class);
-    }
+	/**
+	 * @var string
+	 */
+	protected $name = '__action_permission';
+
+	/**
+	 * @var string
+	 */
+	protected $label = 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:permission';
+
+	/**
+	 * @var array
+	 */
+	protected $suggestions = array(
+		'r' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.read_only',
+		'w' => 'LLL:EXT:media/Resources/Private/Language/locallang.xlf:facet.write',
+	);
+
+	/**
+	 * @var string
+	 */
+	protected $fieldNameAndPath = '';
+
+	/**
+	 * @var string
+	 */
+	protected $dataType;
+
+	/**
+	 * @var bool
+	 */
+	protected $canModifyMatcher = false;
+
+	/**
+	 * Constructor of a Generic Facet in Vidi.
+	 *
+	 * @param string $name
+	 * @param string $label
+	 * @param array $suggestions
+	 * @param string $fieldNameAndPath
+	 */
+	public function __construct($name = '', $label = '', array $suggestions = [], $fieldNameAndPath = '')
+	{
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getLabel()
+	{
+		return $this->getLanguageService()->sL($this->label);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getSuggestions()
+	{
+		$suggestions = [];
+		foreach ($this->suggestions as $key => $label) {
+			$suggestions[] = array($key => $this->getLanguageService()->sL($label));
+		}
+
+		return $suggestions;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function hasSuggestions()
+	{
+		return true;
+	}
+
+	/**
+	 * @param string $dataType
+	 * @return $this
+	 */
+	public function setDataType($dataType)
+	{
+		$this->dataType = $dataType;
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function canModifyMatcher()
+	{
+		return $this->canModifyMatcher;
+	}
+
+	/**
+	 * @param Matcher $matcher
+	 * @param $value
+	 * @return Matcher
+	 */
+	public function modifyMatcher(Matcher $matcher, $value)
+	{
+		return $matcher;
+	}
+
+	/**
+	 * @param AfterFindContentObjectsSignalArguments $signalArguments
+	 * @return array
+	 */
+	public function modifyResultSet(AfterFindContentObjectsSignalArguments $signalArguments)
+	{
+		if ($signalArguments->getDataType() === 'sys_file') {
+			$queryParts = $this->getQueryParts();
+
+			if (!empty($queryParts)) {
+				$permission = $this->getPermissionValue($queryParts);
+
+				if ($permission) {
+					// We are force to query the content repository again here without limit
+					$matcher = $signalArguments->getMatcher();
+					$order = $signalArguments->getOrder();
+					$objects = ContentRepositoryFactory::getInstance($this->dataType)->findBy($matcher, $order);
+
+					$filteredObjects = [];
+					foreach ($objects as $object) {
+						$file = $this->getFileConverter()->convert($object->getUid());
+						if ($permission === 'read' && !$file->checkActionPermission('write')) {
+							$filteredObjects[] = $object;
+						} elseif ($permission === 'write' && $file->checkActionPermission('write')) {
+							$filteredObjects[] = $object;
+						}
+					}
+
+					// Only take part of the array according to offset and limit.
+					$offset = $signalArguments->getOffset();
+					$limit = $signalArguments->getLimit();
+					$signalArguments->setContentObjects(array_slice($filteredObjects, $offset, $limit));
+
+					// Count number of records
+					$signalArguments->setNumberOfObjects(count($filteredObjects));
+					$signalArguments->setHasBeenProcessed(true);
+				}
+			}
+		}
+
+		return array($signalArguments);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getQueryParts()
+	{
+		// Transmit recursive selection parameter.
+		$parameterPrefix = $this->getModuleLoader()->getParameterPrefix();
+		$parameters = GeneralUtility::_GP($parameterPrefix);
+
+		$queryParts = [];
+		if (!empty($parameters['searchTerm'])) {
+			$query = rawurldecode($parameters['searchTerm']);
+			$queryParts = json_decode($query, true);
+		}
+
+		return $queryParts;
+	}
+
+	/**
+	 * Retrieve the search permission value.
+	 *
+	 * @param array $queryParts
+	 * @return string
+	 */
+	protected function getPermissionValue(array $queryParts)
+	{
+		$permission = '';
+
+		// Check also amongst labels.
+		$labelReadOnly = $this->getLanguageService()->sL($this->suggestions['r']);
+		$labelWrite = $this->getLanguageService()->sL($this->suggestions['w']);
+
+		foreach ($queryParts as $queryPart) {
+			$facetName = key($queryPart);
+			$value = $queryPart[$facetName];
+			if ($facetName === $this->name) {
+				if ($value === 'r' || $value === $labelReadOnly) {
+					$permission = 'read';
+				} elseif ($value === 'w' || $value === $labelWrite) {
+					$permission = 'write';
+				}
+			}
+		}
+		return $permission;
+	}
+
+	/**
+	 * Magic method implementation for retrieving state.
+	 *
+	 * @param array $states
+	 * @return $this
+	 */
+	public static function __set_state($states)
+	{
+		return new ActionPermissionFacet($states['name'], $states['label'], $states['suggestions'], $states['fieldNameAndPath']);
+	}
+
+	/**
+	 * @return LanguageService
+	 */
+	protected function getLanguageService()
+	{
+		return $GLOBALS['LANG'];
+	}
+
+	/**
+	 * @return ContentToFileConverter
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(ContentToFileConverter::class);
+	}
+
+	/**
+	 * Get the Vidi Module Loader.
+	 *
+	 * @return ModuleLoader
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getModuleLoader()
+	{
+		return GeneralUtility::makeInstance(ModuleLoader::class);
+	}
 }

Classes/Index/MediaIndexer.php

Indentation +147 added lines, -147 removed lines

@@ -23,151 +23,151 @@
  */
 class MediaIndexer
 {
-    /**
-     * @var ResourceStorage
-     */
-    protected $storage = null;
-
-    /**
-     * @param ResourceStorage $storage
-     */
-    public function __construct(ResourceStorage $storage)
-    {
-        $this->storage = $storage;
-    }
-
-    /**
-     * @param File $file
-     * @return $this
-     */
-    public function updateIndex(File $file)
-    {
-        $this->getCoreIndexer()->updateIndexEntry($file);
-        return $this;
-    }
-
-    /**
-     * @param File $file
-     * @return $this
-     */
-    public function extractMetadata(File $file)
-    {
-        $extractionServices = $this->getExtractorRegistry()->getExtractorsWithDriverSupport($this->storage->getDriverType());
-
-        $newMetaData = array(
-            0 => $file->getMetaData()->get()
-        );
-
-        foreach ($extractionServices as $services) {
-            if (is_array($services)) {
-                foreach ($services as $service) {
-                    if ($service->canProcess($file)) {
-                        $newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
-                    }
-                }
-            } else {
-                $service = $services;
-                // We could optimise here for not repeating this bit
-                if ($service->canProcess($file)) {
-                    $newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
-                }
-            }
-        }
-
-        ksort($newMetaData);
-        $metaData = [];
-        foreach ($newMetaData as $data) {
-            $metaData = array_merge($metaData, $data);
-        }
-        $file->updateProperties($metaData);
-        $this->getMetaDataRepository()->update($file->getUid(), $metaData);
-        $this->getFileIndexRepository()->updateIndexingTime($file->getUid());
-
-        return $this;
-    }
-
-    /**
-     * @param File $file
-     * @return $this
-     */
-    public function applyDefaultCategories(File $file)
-    {
-        $categoryList = ConfigurationUtility::getInstance()->get('default_categories');
-        $categories = GeneralUtility::trimExplode(',', $categoryList, true);
-
-        foreach ($categories as $category) {
-            $values = array(
-                'uid_local' => $category,
-                'uid_foreign' => $this->getFileMetadataIdentifier($file),
-                'tablenames' => 'sys_file_metadata',
-                'fieldname' => 'categories',
-            );
-            $this->getDataService()->insert('sys_category_record_mm', $values);
-        }
-
-        $metaData['categories'] = count($categories);
-        $file->updateProperties($metaData);
-        $this->getMetaDataRepository()->update($file->getUid(), $metaData);
-        $this->getFileIndexRepository()->updateIndexingTime($file->getUid());
-        return $this;
-    }
-
-    /**
-     * Retrieve the file metadata uid which is different from the file uid.
-     *
-     * @param File $file
-     * @return int
-     */
-    protected function getFileMetadataIdentifier(File $file)
-    {
-        $metadataProperties = $file->getMetaData()->get();
-        return isset($metadataProperties['_ORIG_uid']) ? (int)$metadataProperties['_ORIG_uid'] : (int)$metadataProperties['uid'];
-    }
-
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return FileIndexRepository
-     */
-    protected function getFileIndexRepository()
-    {
-        return GeneralUtility::makeInstance(FileIndexRepository::class);
-    }
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return MetaDataRepository
-     */
-    protected function getMetaDataRepository()
-    {
-        return GeneralUtility::makeInstance(MetaDataRepository::class);
-    }
-
-    /**
-     * Returns an instance of the FileIndexRepository
-     *
-     * @return ExtractorRegistry
-     */
-    protected function getExtractorRegistry()
-    {
-        return GeneralUtility::makeInstance(ExtractorRegistry::class);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return Indexer|object
-     */
-    protected function getCoreIndexer()
-    {
-        return GeneralUtility::makeInstance(Indexer::class, $this->storage);
-    }
+	/**
+	 * @var ResourceStorage
+	 */
+	protected $storage = null;
+
+	/**
+	 * @param ResourceStorage $storage
+	 */
+	public function __construct(ResourceStorage $storage)
+	{
+		$this->storage = $storage;
+	}
+
+	/**
+	 * @param File $file
+	 * @return $this
+	 */
+	public function updateIndex(File $file)
+	{
+		$this->getCoreIndexer()->updateIndexEntry($file);
+		return $this;
+	}
+
+	/**
+	 * @param File $file
+	 * @return $this
+	 */
+	public function extractMetadata(File $file)
+	{
+		$extractionServices = $this->getExtractorRegistry()->getExtractorsWithDriverSupport($this->storage->getDriverType());
+
+		$newMetaData = array(
+			0 => $file->getMetaData()->get()
+		);
+
+		foreach ($extractionServices as $services) {
+			if (is_array($services)) {
+				foreach ($services as $service) {
+					if ($service->canProcess($file)) {
+						$newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
+					}
+				}
+			} else {
+				$service = $services;
+				// We could optimise here for not repeating this bit
+				if ($service->canProcess($file)) {
+					$newMetaData[$service->getPriority()] = $service->extractMetaData($file, $newMetaData);
+				}
+			}
+		}
+
+		ksort($newMetaData);
+		$metaData = [];
+		foreach ($newMetaData as $data) {
+			$metaData = array_merge($metaData, $data);
+		}
+		$file->updateProperties($metaData);
+		$this->getMetaDataRepository()->update($file->getUid(), $metaData);
+		$this->getFileIndexRepository()->updateIndexingTime($file->getUid());
+
+		return $this;
+	}
+
+	/**
+	 * @param File $file
+	 * @return $this
+	 */
+	public function applyDefaultCategories(File $file)
+	{
+		$categoryList = ConfigurationUtility::getInstance()->get('default_categories');
+		$categories = GeneralUtility::trimExplode(',', $categoryList, true);
+
+		foreach ($categories as $category) {
+			$values = array(
+				'uid_local' => $category,
+				'uid_foreign' => $this->getFileMetadataIdentifier($file),
+				'tablenames' => 'sys_file_metadata',
+				'fieldname' => 'categories',
+			);
+			$this->getDataService()->insert('sys_category_record_mm', $values);
+		}
+
+		$metaData['categories'] = count($categories);
+		$file->updateProperties($metaData);
+		$this->getMetaDataRepository()->update($file->getUid(), $metaData);
+		$this->getFileIndexRepository()->updateIndexingTime($file->getUid());
+		return $this;
+	}
+
+	/**
+	 * Retrieve the file metadata uid which is different from the file uid.
+	 *
+	 * @param File $file
+	 * @return int
+	 */
+	protected function getFileMetadataIdentifier(File $file)
+	{
+		$metadataProperties = $file->getMetaData()->get();
+		return isset($metadataProperties['_ORIG_uid']) ? (int)$metadataProperties['_ORIG_uid'] : (int)$metadataProperties['uid'];
+	}
+
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return FileIndexRepository
+	 */
+	protected function getFileIndexRepository()
+	{
+		return GeneralUtility::makeInstance(FileIndexRepository::class);
+	}
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return MetaDataRepository
+	 */
+	protected function getMetaDataRepository()
+	{
+		return GeneralUtility::makeInstance(MetaDataRepository::class);
+	}
+
+	/**
+	 * Returns an instance of the FileIndexRepository
+	 *
+	 * @return ExtractorRegistry
+	 */
+	protected function getExtractorRegistry()
+	{
+		return GeneralUtility::makeInstance(ExtractorRegistry::class);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return Indexer|object
+	 */
+	protected function getCoreIndexer()
+	{
+		return GeneralUtility::makeInstance(Indexer::class, $this->storage);
+	}
 }

Classes/Index/IndexAnalyser.php

Indentation +161 added lines, -161 removed lines

@@ -22,170 +22,170 @@
  */
 class IndexAnalyser implements SingletonInterface
 {
-    /**
-     * Return missing file for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     */
-    public function searchForMissingFiles(ResourceStorage $storage)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $missingFiles = [];
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )->execute();
-        while ($row = $statement->fetchAssociative()) {
-            // This task is very memory consuming on large data set e.g > 20'000 records.
-            // We must think of having a pagination if there is the need for such thing.
-            $file = $this->getResourceFactory()->getFileObject($row['uid'], $row);
-            if (!$file->exists()) {
-                $missingFiles[] = $file;
-            }
-        }
-        return $missingFiles;
-    }
-
-    /**
-     * Deletes all missing files for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function deleteMissingFiles(ResourceStorage $storage)
-    {
-        /** @var FileReferenceService $fileReferenceService */
-        $fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
-        $missingFiles = $this->searchForMissingFiles($storage);
-        $deletedFiles = [];
-
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-
-        /** @var File $missingFile */
-        foreach ($missingFiles as $missingFile) {
-            try {
-                // if missingFile has no file references
-                if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
-                    // 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"
-                    $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-                    $queryBuilder->delete('sys_file')
-                        ->where($queryBuilder->expr()->eq('uid', $missingFile->getUid()))
-                        ->execute();
-
-                    $deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-        return $deletedFiles;
-    }
-
-    /*
+	/**
+	 * Return missing file for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForMissingFiles(ResourceStorage $storage)
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$missingFiles = [];
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)->execute();
+		while ($row = $statement->fetchAssociative()) {
+			// This task is very memory consuming on large data set e.g > 20'000 records.
+			// We must think of having a pagination if there is the need for such thing.
+			$file = $this->getResourceFactory()->getFileObject($row['uid'], $row);
+			if (!$file->exists()) {
+				$missingFiles[] = $file;
+			}
+		}
+		return $missingFiles;
+	}
+
+	/**
+	 * Deletes all missing files for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function deleteMissingFiles(ResourceStorage $storage)
+	{
+		/** @var FileReferenceService $fileReferenceService */
+		$fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
+		$missingFiles = $this->searchForMissingFiles($storage);
+		$deletedFiles = [];
+
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+
+		/** @var File $missingFile */
+		foreach ($missingFiles as $missingFile) {
+			try {
+				// if missingFile has no file references
+				if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
+					// 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"
+					$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+					$queryBuilder->delete('sys_file')
+						->where($queryBuilder->expr()->eq('uid', $missingFile->getUid()))
+						->execute();
+
+					$deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+		return $deletedFiles;
+	}
+
+	/*
      * Return duplicates file records
      *
      * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
      * @return array
      */
-    public function searchForDuplicateIdentifiers(ResourceStorage $storage)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )
-            ->groupby('identifier')
-            ->having('count(*) > 1')
-            ->execute();
-
-        // Detect duplicate records.
-        $duplicates = [];
-        while ($row = $statement->fetchAssociative()) {
-            $records = $queryBuilder
-                ->select('*')
-                ->from('sys_file')
-                ->where(
-                    $queryBuilder->expr()->eq('storage', $storage->getUid())
-                )
-                ->andWhere(
-                    $queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['identifier']))
-                )
-                ->execute();
-            $records = $records->fetchAllAssociative();
-            $duplicates[$row['identifier']] = $records;
-        }
-        return $duplicates;
-    }
-
-    /**
-     * Return duplicates file records
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     */
-    public function searchForDuplicateSha1(ResourceStorage $storage)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )
-            ->groupby('sha1')
-            ->having('count(*) > 1')
-            ->execute();
-
-        // Detect duplicate records.
-        $duplicates = [];
-        while ($row = $statement->fetchAssociative()) {
-            $records = $queryBuilder
-                ->select('*')
-                ->from('sys_file')
-                ->where(
-                    $queryBuilder->expr()->eq('storage', $storage->getUid())
-                )
-                ->andWhere(
-                    $queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['sha1']))
-                )
-                ->execute();
-            $records = $records->fetchAllAssociative();
-            $duplicates[$row['sha1']] = $records;
-        }
-        return $duplicates;
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	public function searchForDuplicateIdentifiers(ResourceStorage $storage)
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)
+			->groupby('identifier')
+			->having('count(*) > 1')
+			->execute();
+
+		// Detect duplicate records.
+		$duplicates = [];
+		while ($row = $statement->fetchAssociative()) {
+			$records = $queryBuilder
+				->select('*')
+				->from('sys_file')
+				->where(
+					$queryBuilder->expr()->eq('storage', $storage->getUid())
+				)
+				->andWhere(
+					$queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['identifier']))
+				)
+				->execute();
+			$records = $records->fetchAllAssociative();
+			$duplicates[$row['identifier']] = $records;
+		}
+		return $duplicates;
+	}
+
+	/**
+	 * Return duplicates file records
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForDuplicateSha1(ResourceStorage $storage)
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)
+			->groupby('sha1')
+			->having('count(*) > 1')
+			->execute();
+
+		// Detect duplicate records.
+		$duplicates = [];
+		while ($row = $statement->fetchAssociative()) {
+			$records = $queryBuilder
+				->select('*')
+				->from('sys_file')
+				->where(
+					$queryBuilder->expr()->eq('storage', $storage->getUid())
+				)
+				->andWhere(
+					$queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['sha1']))
+				)
+				->execute();
+			$records = $records->fetchAllAssociative();
+			$duplicates[$row['sha1']] = $records;
+		}
+		return $duplicates;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Index/TitleMetadataExtractor.php

Indentation +111 added lines, -111 removed lines

@@ -20,124 +20,124 @@
  */
 class TitleMetadataExtractor implements ExtractorInterface
 {
-    /**
-     * Returns an array of supported file types;
-     * An empty array indicates all filetypes
-     *
-     * @return array
-     */
-    public function getFileTypeRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Returns an array of supported file types;
+	 * An empty array indicates all filetypes
+	 *
+	 * @return array
+	 */
+	public function getFileTypeRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Get all supported DriverClasses
-     * Since some extractors may only work for local files, and other extractors
-     * are especially made for grabbing data from remote.
-     * Returns array of string with driver names of Drivers which are supported,
-     * If the driver did not register a name, it's the classname.
-     * empty array indicates no restrictions
-     *
-     * @return array
-     */
-    public function getDriverRestrictions()
-    {
-        return [];
-    }
+	/**
+	 * Get all supported DriverClasses
+	 * Since some extractors may only work for local files, and other extractors
+	 * are especially made for grabbing data from remote.
+	 * Returns array of string with driver names of Drivers which are supported,
+	 * If the driver did not register a name, it's the classname.
+	 * empty array indicates no restrictions
+	 *
+	 * @return array
+	 */
+	public function getDriverRestrictions()
+	{
+		return [];
+	}
 
-    /**
-     * Returns the data priority of the extraction Service.
-     * Defines the precedence of Data if several extractors
-     * extracted the same property.
-     * Should be between 1 and 100, 100 is more important than 1
-     *
-     * @return integer
-     */
-    public function getPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the data priority of the extraction Service.
+	 * Defines the precedence of Data if several extractors
+	 * extracted the same property.
+	 * Should be between 1 and 100, 100 is more important than 1
+	 *
+	 * @return integer
+	 */
+	public function getPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Returns the execution priority of the extraction Service
-     * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
-     *
-     * @return integer
-     */
-    public function getExecutionPriority()
-    {
-        return 15;
-    }
+	/**
+	 * Returns the execution priority of the extraction Service
+	 * Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
+	 *
+	 * @return integer
+	 */
+	public function getExecutionPriority()
+	{
+		return 15;
+	}
 
-    /**
-     * Checks if the given file can be processed by this Extractor
-     *
-     * @param File $file
-     * @return boolean
-     */
-    public function canProcess(File $file)
-    {
-        return true;
-    }
+	/**
+	 * Checks if the given file can be processed by this Extractor
+	 *
+	 * @param File $file
+	 * @return boolean
+	 */
+	public function canProcess(File $file)
+	{
+		return true;
+	}
 
-    /**
-     * The actual processing TASK
-     * Should return an array with database properties for sys_file_metadata to write
-     *
-     * @param File $file
-     * @param array $previousExtractedData optional, contains the array of already extracted data
-     * @return array
-     */
-    public function extractMetaData(File $file, array $previousExtractedData = [])
-    {
-        $metadata = [];
-        $title = $file->getProperty('title');
-        if (empty($title)) {
-            $metadata = array('title' => $this->guessTitle($file->getName()));
-        }
-        return $metadata;
-    }
+	/**
+	 * The actual processing TASK
+	 * Should return an array with database properties for sys_file_metadata to write
+	 *
+	 * @param File $file
+	 * @param array $previousExtractedData optional, contains the array of already extracted data
+	 * @return array
+	 */
+	public function extractMetaData(File $file, array $previousExtractedData = [])
+	{
+		$metadata = [];
+		$title = $file->getProperty('title');
+		if (empty($title)) {
+			$metadata = array('title' => $this->guessTitle($file->getName()));
+		}
+		return $metadata;
+	}
 
-    /**
-     * Guess a title given a file name. Examples:
-     * name: my-file-name.jpg -> title: My file name
-     * name: myFileName.jpg -> title: My file name
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function guessTitle($fileName)
-    {
-        $fileNameWithoutExtension = $this->removeExtension($fileName);
+	/**
+	 * Guess a title given a file name. Examples:
+	 * name: my-file-name.jpg -> title: My file name
+	 * name: myFileName.jpg -> title: My file name
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function guessTitle($fileName)
+	{
+		$fileNameWithoutExtension = $this->removeExtension($fileName);
 
-        $title = $fileNameWithoutExtension;
-        // first case: the name is separated by _ or -
-        // second case: this is an upper camel case name
-        if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
-            $title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
-        } elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
-            $parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
-            $title = implode(' ', $parts);
-        }
+		$title = $fileNameWithoutExtension;
+		// first case: the name is separated by _ or -
+		// second case: this is an upper camel case name
+		if (preg_match('/-|_/is', $fileNameWithoutExtension)) {
+			$title = preg_replace('/-|_/is', ' ', $fileNameWithoutExtension);
+		} elseif (preg_match('/[A-Z]/', $fileNameWithoutExtension)) {
+			$parts = preg_split('/(?=[A-Z])/', $fileNameWithoutExtension, -1, PREG_SPLIT_NO_EMPTY);
+			$title = implode(' ', $parts);
+		}
 
-        // Remove double space.
-        $title = preg_replace('/\s+/', ' ', $title);
-        return ucfirst($title);
-    }
+		// Remove double space.
+		$title = preg_replace('/\s+/', ' ', $title);
+		return ucfirst($title);
+	}
 
-    /**
-     * Remove extension of a file.
-     *
-     * @param string $fileName
-     * @return string
-     */
-    protected function removeExtension($fileName)
-    {
-        $parts = explode('.', $fileName);
-        if (!empty($parts)) {
-            array_pop($parts);
-        }
-        return implode('.', $parts);
-    }
+	/**
+	 * Remove extension of a file.
+	 *
+	 * @param string $fileName
+	 * @return string
+	 */
+	protected function removeExtension($fileName)
+	{
+		$parts = explode('.', $fileName);
+		if (!empty($parts)) {
+			array_pop($parts);
+		}
+		return implode('.', $parts);
+	}
 }

Classes/Form/AbstractFormField.php

Indentation +264 added lines, -264 removed lines

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

Classes/Form/FileUploadTceForms.php

Indentation +55 added lines, -55 removed lines

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

Spacing +1 added lines, -1 removed lines

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

Classes/Form/FormFieldInterface.php

Indentation +9 added lines, -9 removed lines

@@ -14,14 +14,14 @@
  */
 interface FormFieldInterface
 {
-    /**
-     * @return string
-     */
-    public function render();
+	/**
+	 * @return string
+	 */
+	public function render();
 
-    /**
-     * @param string $template
-     * @return \Fab\Media\Form\FormFieldInterface
-     */
-    public function setTemplate($template);
+	/**
+	 * @param string $template
+	 * @return \Fab\Media\Form\FormFieldInterface
+	 */
+	public function setTemplate($template);
 }

Classes/Form/FileUpload.php

Indentation +206 added lines, -206 removed lines

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

Spacing +5 added lines, -6 removed lines

@@ -49,7 +49,7 @@ 
     public function __construct()
     {
         $this->addLanguage();
-        $this->elementId = 'jquery-wrapped-fine-uploader-' . uniqid();
+        $this->elementId = 'jquery-wrapped-fine-uploader-'.uniqid();
 
         $this->template = <<<EOF
 <div class="control-group control-group-upload" style="%s">
@@ -72,7 +72,7 @@ 
     {
         /** @var PageRenderer $pageRenderer */
         $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media') . 'Resources/Private/Language/locallang.xlf', 'media_file_upload');
+        $pageRenderer->addInlineLanguageLabelFile(ExtensionManagementUtility::extPath('media').'Resources/Private/Language/locallang.xlf', 'media_file_upload');
     }
 
     /**
@@ -155,7 +155,7 @@ 
         /** @var StandaloneView $view */
         $view = GeneralUtility::makeInstance(StandaloneView::class);
 
-        $templatePathAndFilename = ExtensionManagementUtility::extPath('media') . $this->templateFile;
+        $templatePathAndFilename = ExtensionManagementUtility::extPath('media').$this->templateFile;
         $view->setTemplatePathAndFilename($templatePathAndFilename);
 
         return $view;
@@ -171,7 +171,7 @@ 
         // Get the base prefix
         $basePrefix = $this->getBasePrefix($this->getPrefix());
 
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUpload.js';
+        $filePath = ExtensionManagementUtility::extPath('media').'Resources/Private/Standalone/FileUpload.js';
 
         return sprintf(
             file_get_contents($filePath),
@@ -181,8 +181,7 @@ 
             $this->getAllowedExtensions(),
             GeneralUtility::getMaxUploadFileSize() * 1024,
             $this->isDrivenByFolder() ?
-                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() :
-                $this->getMediaModule()->getCurrentStorage()->getUid() . ':/'
+                $this->getMediaModule()->getCurrentFolder()->getCombinedIdentifier() : $this->getMediaModule()->getCurrentStorage()->getUid().':/'
         );
     }