fabarea / media

Classes/Command/DuplicateRecordsCommandController.php

Indentation +186 added lines, -186 removed lines

@@ -18,191 +18,191 @@
 class DuplicateRecordsCommandController extends CommandController
 {
 
-    /**
-     * @var array
-     */
-    protected $message = [];
-
-    /**
-     * @var array
-     */
-    protected $duplicateRecords = [];
-
-    /**
-     * @var \TYPO3\CMS\Core\Mail\MailMessage
-     */
-    protected $mailMessage;
-
-    /**
-     * Check whether the Index is Ok. In case not, display a message on the console.
-     *
-     * @return void
-     */
-    public function analyseCommand()
-    {
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // For the CLI cause.
-            $storage->setEvaluatePermissions(false);
-
-            $this->printOut();
-            $this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-            $this->printOut('--------------------------------------------');
-
-            if ($storage->isOnline()) {
-
-                $duplicateRecords = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
-
-                // Duplicate file object
-                if (empty($duplicateRecords)) {
-                    $this->printOut();
-                    $this->printOut('Looks good, no duplicate records!');
-                } else {
-                    $this->printOut();
-                    $this->printOut('Duplicated identifiers detected:');
-                    $this->duplicateRecords[$storage->getUid()] = $duplicateRecords; // Store duplicate files.
-
-                    foreach ($duplicateRecords as $identifier => $duplicate) {
-
-                        // build temporary array
-                        $uids = [];
-                        foreach ($duplicate as $value) {
-                            $uids[] = $value['uid'];
-                        }
-
-                        $message = sprintf('* uids "%s" having same identifier %s',
-                            implode(',', $uids),
-                            $identifier
-                        );
-                        $this->printOut($message);
-
-                    }
-                }
-            } else {
-                $this->outputLine('Storage is offline!');
-            }
-        }
-
-        $to = $this->getTo();
-        if (!empty($to)) {
-            $this->sendReport();
-        }
-    }
-
-    /**
-     * Print a message and store its content in a variable for the email report.
-     *
-     * @param string $message
-     * @return void
-     */
-    protected function printOut($message = '')
-    {
-        $this->message[] = $message;
-        $this->outputLine($message);
-    }
-
-    /**
-     * Send a possible report to an admin.
-     *
-     * @throws \Exception
-     * @return void
-     */
-    protected function sendReport()
-    {
-        if ($this->hasReport()) {
-
-            // Prepare email.
-            $this->getMailMessage()->setTo($this->getTo())
-                ->setFrom($this->getFrom())
-                ->setSubject('Duplicate records detected!')
-                ->setBody(implode("\n", $this->message));
-
-            $isSent = $this->getMailMessage()->send();
-
-            if (!$isSent) {
-                throw new \Exception('I could not send a message', 1408343882);
-            }
-
-            $to = $this->getTo();
-            $this->outputLine();
-            $message = sprintf('Report was sent to %s', key($to));
-            $this->outputLine($message);
-        }
-    }
-
-    /**
-     * Send a report
-     *
-     * @return bool
-     */
-    protected function hasReport()
-    {
-        return !empty($this->duplicateRecords);
-    }
-
-    /**
-     * @return array
-     */
-    protected function getTo()
-    {
-
-        $to = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $to[$emailAddress] = $name;
-
-        }
-        return $to;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getFrom()
-    {
-
-        $from = [];
-
-        // @todo make me more flexible!
-        if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
-            $emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
-            $name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
-            $from[$emailAddress] = $name;
-        }
-        return $from;
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * @return \TYPO3\CMS\Core\Mail\MailMessage|object
-     */
-    public function getMailMessage()
-    {
-        if (is_null($this->mailMessage)) {
-            $this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
-        }
-        return $this->mailMessage;
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \Fab\Media\Index\IndexAnalyser|object
-     */
-    protected function getIndexAnalyser()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
-    }
+	/**
+	 * @var array
+	 */
+	protected $message = [];
+
+	/**
+	 * @var array
+	 */
+	protected $duplicateRecords = [];
+
+	/**
+	 * @var \TYPO3\CMS\Core\Mail\MailMessage
+	 */
+	protected $mailMessage;
+
+	/**
+	 * Check whether the Index is Ok. In case not, display a message on the console.
+	 *
+	 * @return void
+	 */
+	public function analyseCommand()
+	{
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// For the CLI cause.
+			$storage->setEvaluatePermissions(false);
+
+			$this->printOut();
+			$this->printOut(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+			$this->printOut('--------------------------------------------');
+
+			if ($storage->isOnline()) {
+
+				$duplicateRecords = $this->getIndexAnalyser()->searchForDuplicateIdentifiers($storage);
+
+				// Duplicate file object
+				if (empty($duplicateRecords)) {
+					$this->printOut();
+					$this->printOut('Looks good, no duplicate records!');
+				} else {
+					$this->printOut();
+					$this->printOut('Duplicated identifiers detected:');
+					$this->duplicateRecords[$storage->getUid()] = $duplicateRecords; // Store duplicate files.
+
+					foreach ($duplicateRecords as $identifier => $duplicate) {
+
+						// build temporary array
+						$uids = [];
+						foreach ($duplicate as $value) {
+							$uids[] = $value['uid'];
+						}
+
+						$message = sprintf('* uids "%s" having same identifier %s',
+							implode(',', $uids),
+							$identifier
+						);
+						$this->printOut($message);
+
+					}
+				}
+			} else {
+				$this->outputLine('Storage is offline!');
+			}
+		}
+
+		$to = $this->getTo();
+		if (!empty($to)) {
+			$this->sendReport();
+		}
+	}
+
+	/**
+	 * Print a message and store its content in a variable for the email report.
+	 *
+	 * @param string $message
+	 * @return void
+	 */
+	protected function printOut($message = '')
+	{
+		$this->message[] = $message;
+		$this->outputLine($message);
+	}
+
+	/**
+	 * Send a possible report to an admin.
+	 *
+	 * @throws \Exception
+	 * @return void
+	 */
+	protected function sendReport()
+	{
+		if ($this->hasReport()) {
+
+			// Prepare email.
+			$this->getMailMessage()->setTo($this->getTo())
+				->setFrom($this->getFrom())
+				->setSubject('Duplicate records detected!')
+				->setBody(implode("\n", $this->message));
+
+			$isSent = $this->getMailMessage()->send();
+
+			if (!$isSent) {
+				throw new \Exception('I could not send a message', 1408343882);
+			}
+
+			$to = $this->getTo();
+			$this->outputLine();
+			$message = sprintf('Report was sent to %s', key($to));
+			$this->outputLine($message);
+		}
+	}
+
+	/**
+	 * Send a report
+	 *
+	 * @return bool
+	 */
+	protected function hasReport()
+	{
+		return !empty($this->duplicateRecords);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getTo()
+	{
+
+		$to = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$to[$emailAddress] = $name;
+
+		}
+		return $to;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getFrom()
+	{
+
+		$from = [];
+
+		// @todo make me more flexible!
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'])) {
+			$emailAddress = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromAddress'];
+			$name = $GLOBALS['TYPO3_CONF_VARS']['MAIL']['defaultMailFromName'];
+			$from[$emailAddress] = $name;
+		}
+		return $from;
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * @return \TYPO3\CMS\Core\Mail\MailMessage|object
+	 */
+	public function getMailMessage()
+	{
+		if (is_null($this->mailMessage)) {
+			$this->mailMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
+		}
+		return $this->mailMessage;
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \Fab\Media\Index\IndexAnalyser|object
+	 */
+	protected function getIndexAnalyser()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Index\IndexAnalyser::class);
+	}
 
 }

Classes/Grid/UsageRenderer.php

Indentation +209 added lines, -209 removed lines

@@ -22,213 +22,213 @@
 class UsageRenderer extends ColumnRendererAbstract
 {
 
-    /**
-     * Render usage of an asset in the grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $file = $this->getFileConverter()->convert($this->object);
-
-        $result = '';
-
-        // Add number of references on the top!
-        if ($this->object['number_of_references'] > 1) {
-            $result .= sprintf(
-                '<div><strong>%s (%s)</strong></div>',
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:references'),
-                $this->object['number_of_references']
-            );
-        }
-
-        // Render File usage
-        $fileReferences = $this->getFileReferenceService()->findFileReferences($file);
-        if (!empty($fileReferences)) {
-
-            // Finalize file references assembling.
-            $result .= sprintf(
-                $this->getWrappingTemplate(),
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:file_reference'),
-                $this->assembleOutput($fileReferences, array('referenceIdentifier' => 'uid_foreign', 'tableName' => 'tablenames'))
-            );
-        }
-
-        // Render link usage in RTE
-        $linkSoftReferences = $this->getFileReferenceService()->findSoftLinkReferences($file);
-        if (!empty($linkSoftReferences)) {
-
-            // Finalize link references assembling.
-            $result .= sprintf(
-                $this->getWrappingTemplate(),
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:link_references_in_rte'),
-                $this->assembleOutput($linkSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
-            );
-        }
-
-        // Render image usage in RTE
-        $imageSoftReferences = $this->getFileReferenceService()->findSoftImageReferences($file);
-        if (!empty($imageSoftReferences)) {
-
-            // Finalize image references assembling.
-            $result .= sprintf(
-                $this->getWrappingTemplate(),
-                $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:image_references_in_rte'),
-                $this->assembleOutput($imageSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Assemble output reference.
-     *
-     * @param array $references
-     * @param array $mapping
-     * @return string
-     */
-    protected function assembleOutput(array $references, array $mapping)
-    {
-
-        $result = '';
-        foreach ($references as $reference) {
-            $button = $this->makeLinkButton()
-                ->setHref($this->getEditUri($reference, $mapping))
-                ->setClasses('btn-edit-reference')
-                ->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
-                ->render();
-
-            $tableName = $reference[$mapping['tableName']];
-            $identifier = (int)$reference[$mapping['referenceIdentifier']];
-
-            $result .= sprintf(
-                '<li title="">%s %s</li>',
-                $button,
-                $this->computeTitle($tableName, $identifier)
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param string $tableName
-     * @param int $identifier
-     * @return string
-     */
-    protected function computeTitle($tableName, $identifier)
-    {
-        $title = '';
-        if (!empty($GLOBALS['TCA'][$tableName])) {
-            $title = $this->getRecordTitle($tableName, $identifier);
-            if (!$title) {
-                $title = Tca::table($tableName)->getTitle();
-            }
-        }
-        return $title;
-    }
-
-    /**
-     * @return object|LinkButton
-     */
-    protected function makeLinkButton()
-    {
-        return GeneralUtility::makeInstance(LinkButton::class);
-    }
-
-    /**
-     * @param array $reference
-     * @param array $mapping
-     * @return string
-     */
-    protected function getEditUri(array $reference, array $mapping)
-    {
-
-        $parameterName = sprintf('edit[%s][%s]', $reference[$mapping['tableName']], $reference[$mapping['referenceIdentifier']]);
-        $uri = BackendUtility::getModuleUrl(
-            'record_edit',
-            array(
-                $parameterName => 'edit',
-                'returnUrl' => $this->getModuleUrl()
-            )
-        );
-        return $uri;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getModuleUrl()
-    {
-
-        $additionalParameters = [];
-        if (GeneralUtility::_GP('id')) {
-            $additionalParameters = array(
-                'id' => urldecode(GeneralUtility::_GP('id')),
-            );
-        }
-        return BackendUtility::getModuleUrl(GeneralUtility::_GP('route'), $additionalParameters);
-    }
-
-    /**
-     * Return the title given a table name and an identifier.
-     *
-     * @param string $tableName
-     * @param string $identifier
-     * @return string
-     */
-    protected function getRecordTitle($tableName, $identifier)
-    {
-
-        $result = '';
-        if ($tableName && (int)$identifier > 0) {
-
-            $labelField = Tca::table($tableName)->getLabelField();
-
-            // Get the title of the record.
-            $record = $this->getDataService()
-                ->getRecord($tableName, ['uid' => $identifier,]);
-
-            if (!empty($record[$labelField])) {
-                $result = $record[$labelField];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * Return the wrapping HTML template.
-     *
-     * @return string
-     */
-    protected function getWrappingTemplate()
-    {
-        return '<div style="text-decoration: underline; margin-top: 10px; margin-bottom: 10px">%s</div><ul class="usage-list">%s</ul>';
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
-
-    /**
-     * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
-    }
+	/**
+	 * Render usage of an asset in the grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$file = $this->getFileConverter()->convert($this->object);
+
+		$result = '';
+
+		// Add number of references on the top!
+		if ($this->object['number_of_references'] > 1) {
+			$result .= sprintf(
+				'<div><strong>%s (%s)</strong></div>',
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:references'),
+				$this->object['number_of_references']
+			);
+		}
+
+		// Render File usage
+		$fileReferences = $this->getFileReferenceService()->findFileReferences($file);
+		if (!empty($fileReferences)) {
+
+			// Finalize file references assembling.
+			$result .= sprintf(
+				$this->getWrappingTemplate(),
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:file_reference'),
+				$this->assembleOutput($fileReferences, array('referenceIdentifier' => 'uid_foreign', 'tableName' => 'tablenames'))
+			);
+		}
+
+		// Render link usage in RTE
+		$linkSoftReferences = $this->getFileReferenceService()->findSoftLinkReferences($file);
+		if (!empty($linkSoftReferences)) {
+
+			// Finalize link references assembling.
+			$result .= sprintf(
+				$this->getWrappingTemplate(),
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:link_references_in_rte'),
+				$this->assembleOutput($linkSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
+			);
+		}
+
+		// Render image usage in RTE
+		$imageSoftReferences = $this->getFileReferenceService()->findSoftImageReferences($file);
+		if (!empty($imageSoftReferences)) {
+
+			// Finalize image references assembling.
+			$result .= sprintf(
+				$this->getWrappingTemplate(),
+				$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:image_references_in_rte'),
+				$this->assembleOutput($imageSoftReferences, array('referenceIdentifier' => 'recuid', 'tableName' => 'tablename'))
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Assemble output reference.
+	 *
+	 * @param array $references
+	 * @param array $mapping
+	 * @return string
+	 */
+	protected function assembleOutput(array $references, array $mapping)
+	{
+
+		$result = '';
+		foreach ($references as $reference) {
+			$button = $this->makeLinkButton()
+				->setHref($this->getEditUri($reference, $mapping))
+				->setClasses('btn-edit-reference')
+				->setIcon($this->getIconFactory()->getIcon('actions-document-open', Icon::SIZE_SMALL))
+				->render();
+
+			$tableName = $reference[$mapping['tableName']];
+			$identifier = (int)$reference[$mapping['referenceIdentifier']];
+
+			$result .= sprintf(
+				'<li title="">%s %s</li>',
+				$button,
+				$this->computeTitle($tableName, $identifier)
+			);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @param int $identifier
+	 * @return string
+	 */
+	protected function computeTitle($tableName, $identifier)
+	{
+		$title = '';
+		if (!empty($GLOBALS['TCA'][$tableName])) {
+			$title = $this->getRecordTitle($tableName, $identifier);
+			if (!$title) {
+				$title = Tca::table($tableName)->getTitle();
+			}
+		}
+		return $title;
+	}
+
+	/**
+	 * @return object|LinkButton
+	 */
+	protected function makeLinkButton()
+	{
+		return GeneralUtility::makeInstance(LinkButton::class);
+	}
+
+	/**
+	 * @param array $reference
+	 * @param array $mapping
+	 * @return string
+	 */
+	protected function getEditUri(array $reference, array $mapping)
+	{
+
+		$parameterName = sprintf('edit[%s][%s]', $reference[$mapping['tableName']], $reference[$mapping['referenceIdentifier']]);
+		$uri = BackendUtility::getModuleUrl(
+			'record_edit',
+			array(
+				$parameterName => 'edit',
+				'returnUrl' => $this->getModuleUrl()
+			)
+		);
+		return $uri;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getModuleUrl()
+	{
+
+		$additionalParameters = [];
+		if (GeneralUtility::_GP('id')) {
+			$additionalParameters = array(
+				'id' => urldecode(GeneralUtility::_GP('id')),
+			);
+		}
+		return BackendUtility::getModuleUrl(GeneralUtility::_GP('route'), $additionalParameters);
+	}
+
+	/**
+	 * Return the title given a table name and an identifier.
+	 *
+	 * @param string $tableName
+	 * @param string $identifier
+	 * @return string
+	 */
+	protected function getRecordTitle($tableName, $identifier)
+	{
+
+		$result = '';
+		if ($tableName && (int)$identifier > 0) {
+
+			$labelField = Tca::table($tableName)->getLabelField();
+
+			// Get the title of the record.
+			$record = $this->getDataService()
+				->getRecord($tableName, ['uid' => $identifier,]);
+
+			if (!empty($record[$labelField])) {
+				$result = $record[$labelField];
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * Return the wrapping HTML template.
+	 *
+	 * @return string
+	 */
+	protected function getWrappingTemplate()
+	{
+		return '<div style="text-decoration: underline; margin-top: 10px; margin-bottom: 10px">%s</div><ul class="usage-list">%s</ul>';
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
+
+	/**
+	 * @return \Fab\Media\TypeConverter\ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\TypeConverter\ContentToFileConverter::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -188,7 +188,7 @@
 
             // Get the title of the record.
             $record = $this->getDataService()
-                ->getRecord($tableName, ['uid' => $identifier,]);
+                ->getRecord($tableName, ['uid' => $identifier, ]);
 
             if (!empty($record[$labelField])) {
                 $result = $record[$labelField];

Classes/ViewHelpers/Form/FooterViewHelper.php

Indentation +117 added lines, -117 removed lines

@@ -23,121 +23,121 @@
 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->getDataService()
-                ->getRecord(
-                    'be_users',
-                    [
-                        'uid' => $userIdentifier
-                    ]
-                );
-            $username = sprintf('%s %s',
-                LocalizationUtility::translate('by', 'media'),
-                empty($record['realName']) ? $record['username'] : $record['realName']
-            );
-        }
-
-        return $username;
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @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->getDataService()
+				->getRecord(
+					'be_users',
+					[
+						'uid' => $userIdentifier
+					]
+				);
+			$username = sprintf('%s %s',
+				LocalizationUtility::translate('by', 'media'),
+				empty($record['realName']) ? $record['username'] : $record['realName']
+			);
+		}
+
+		return $username;
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @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);
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -53,7 +53,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'))
         );
 
@@ -125,12 +125,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);
             }
         }
 

Classes/Cache/CacheService.php

Indentation +241 added lines, -241 removed lines

@@ -22,245 +22,245 @@
 class CacheService
 {
 
-    /**
-     * Traverse all files and initialize cache values.
-     *
-     * @return int
-     */
-    public function warmUp()
-    {
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file');
-        $rows = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where('storage > 0')
-            ->execute()
-            ->fetchAll();
-
-        $counter = 0;
-        foreach ($rows as $row) {
-
-            $fileIdentifier = $row['uid'];
-            $totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
-
-            $values = array(
-                'number_of_references' => $totalNumberOfReferences
-            );
-
-            $this->getDataService()->update(
-                'sys_file',
-                $values,
-                [
-                    'uid' => $fileIdentifier
-                ]
-            );
-            $counter++;
-        }
-
-        return $counter;
-    }
-
-    /**
-     * Clear all possible cache related to a file.
-     * This method is useful when replacing a file for instance.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function clearCache(File $file)
-    {
-
-        $this->clearCachePages($file);
-        $this->flushProcessedFiles($file);
-    }
-
-    /**
-     * Remove all processed files that belong to the given File object.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function flushProcessedFiles(File $file)
-    {
-
-        /** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
-        foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
-            if ($processedFile->exists()) {
-                $processedFile->delete(true);
-            }
-
-            $this->getDataService()->delete(
-                'sys_file_processedfile',
-                [
-                    'uid' => (int)$processedFile->getUid()
-                ]
-            );
-        }
-    }
-
-    /**
-     * Return a processed file repository
-     *
-     * @return \TYPO3\CMS\Core\Resource\ProcessedFileRepository|object
-     */
-    protected function getProcessedFileRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ProcessedFileRepository::class);
-    }
-
-    /**
-     * Returns the file references.
-     *
-     * @param File $file
-     * @return void
-     */
-    protected function clearCachePages($file)
-    {
-
-        /** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
-        $tce = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
-        $tce->start([], []);
-
-        #$pages = array_merge(
-        #    $this->findPagesWithFileReferences($file),
-        #    $this->findPagesWithSoftReferences($file)
-        #);
-
-        // Previous code which does not work in TYPO3 CMS 7 LTS.
-        // It is adviced to use "registerPageCacheClearing" but how?
-        #foreach (array_unique($pages) as $page) {
-        #    $tce->clear_cache('pages', $page);
-        #}
-        $tce->clear_cacheCmd('pages');
-    }
-
-    /**
-     * Find all pages which contains file references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    protected function findPagesWithFileReferences($file)
-    {
-
-        /** @var QueryBuilder $queryBuilder */
-        $queryBuilder = $this->getQueryBuilder('sys_file_reference');
-        $rows = $queryBuilder
-            ->select('pid')
-            ->from('sys_file_reference')
-            ->groupBy('pid') // no support for distinct
-            ->andWhere(
-                'pid > 0',
-                'uid_local = ' . $file->getUid()
-            )
-            ->execute()
-            ->fetchAll();
-
-        foreach ($rows as $row) {
-            $pages[] = $row['pid'];
-
-        }
-
-        return $pages;
-    }
-
-    /**
-     * Find all pages which have soft references to the given $file.
-     *
-     * @param File $file
-     * @return array
-     */
-    #protected function findPagesWithSoftReferences(File $file)
-    #{
-    #    $subClauseParts = array(
-    #        'deleted = 0',
-    #        '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
-    #        'ref_table = "sys_file"',
-    #        'tablename = "tt_content"',
-    #        'ref_uid = ' . $file->getUid(),
-    #    );
-    #
-    #    $rows = $this->getDatabaseConnection()->exec_SELECTquery(
-    #        'DISTINCT pid',
-    #        'tt_content',
-    #        sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
-    #            implode(' AND ', $subClauseParts),
-    #            $this->getWhereClauseForEnabledFields('tt_content')
-    #        )
-    #    );
-    #
-    #    // Compute result
-    #    $pages = [];
-    #    while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
-    #        $pages[] = $affectedPage['pid'];
-    #    }
-    #
-    #    return $pages;
-    #}
-
-    /**
-     * Get the WHERE clause for the enabled fields given a $tableName.
-     *
-     * @param string $tableName
-     * @return string
-     */
-    protected function getWhereClauseForEnabledFields($tableName)
-    {
-        if ($this->isFrontendMode()) {
-            // frontend context
-            $whereClause = $this->getPageRepository()->deleteClause($tableName);
-        } else {
-            // backend context
-            $whereClause = BackendUtility::deleteClause($tableName);
-        }
-        return $whereClause;
-    }
-
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return string
-     */
-    protected function isFrontendMode()
-    {
-        return TYPO3_MODE == 'FE';
-    }
-
-    /**
-     * Returns an instance of the page repository.
-     *
-     * @return \TYPO3\CMS\Frontend\Page\PageRepository
-     */
-    protected function getPageRepository()
-    {
-        return $GLOBALS['TSFE']->sys_page;
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @return \Fab\Media\Resource\FileReferenceService|object
-     */
-    protected function getFileReferenceService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
-    }
+	/**
+	 * Traverse all files and initialize cache values.
+	 *
+	 * @return int
+	 */
+	public function warmUp()
+	{
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file');
+		$rows = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where('storage > 0')
+			->execute()
+			->fetchAll();
+
+		$counter = 0;
+		foreach ($rows as $row) {
+
+			$fileIdentifier = $row['uid'];
+			$totalNumberOfReferences = $this->getFileReferenceService()->countTotalReferences($fileIdentifier);
+
+			$values = array(
+				'number_of_references' => $totalNumberOfReferences
+			);
+
+			$this->getDataService()->update(
+				'sys_file',
+				$values,
+				[
+					'uid' => $fileIdentifier
+				]
+			);
+			$counter++;
+		}
+
+		return $counter;
+	}
+
+	/**
+	 * Clear all possible cache related to a file.
+	 * This method is useful when replacing a file for instance.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function clearCache(File $file)
+	{
+
+		$this->clearCachePages($file);
+		$this->flushProcessedFiles($file);
+	}
+
+	/**
+	 * Remove all processed files that belong to the given File object.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function flushProcessedFiles(File $file)
+	{
+
+		/** @var $processedFile \TYPO3\CMS\Core\Resource\ProcessedFile */
+		foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($file) as $processedFile) {
+			if ($processedFile->exists()) {
+				$processedFile->delete(true);
+			}
+
+			$this->getDataService()->delete(
+				'sys_file_processedfile',
+				[
+					'uid' => (int)$processedFile->getUid()
+				]
+			);
+		}
+	}
+
+	/**
+	 * Return a processed file repository
+	 *
+	 * @return \TYPO3\CMS\Core\Resource\ProcessedFileRepository|object
+	 */
+	protected function getProcessedFileRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ProcessedFileRepository::class);
+	}
+
+	/**
+	 * Returns the file references.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	protected function clearCachePages($file)
+	{
+
+		/** @var $tce \TYPO3\CMS\Core\DataHandling\DataHandler */
+		$tce = GeneralUtility::makeInstance(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+		$tce->start([], []);
+
+		#$pages = array_merge(
+		#    $this->findPagesWithFileReferences($file),
+		#    $this->findPagesWithSoftReferences($file)
+		#);
+
+		// Previous code which does not work in TYPO3 CMS 7 LTS.
+		// It is adviced to use "registerPageCacheClearing" but how?
+		#foreach (array_unique($pages) as $page) {
+		#    $tce->clear_cache('pages', $page);
+		#}
+		$tce->clear_cacheCmd('pages');
+	}
+
+	/**
+	 * Find all pages which contains file references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	protected function findPagesWithFileReferences($file)
+	{
+
+		/** @var QueryBuilder $queryBuilder */
+		$queryBuilder = $this->getQueryBuilder('sys_file_reference');
+		$rows = $queryBuilder
+			->select('pid')
+			->from('sys_file_reference')
+			->groupBy('pid') // no support for distinct
+			->andWhere(
+				'pid > 0',
+				'uid_local = ' . $file->getUid()
+			)
+			->execute()
+			->fetchAll();
+
+		foreach ($rows as $row) {
+			$pages[] = $row['pid'];
+
+		}
+
+		return $pages;
+	}
+
+	/**
+	 * Find all pages which have soft references to the given $file.
+	 *
+	 * @param File $file
+	 * @return array
+	 */
+	#protected function findPagesWithSoftReferences(File $file)
+	#{
+	#    $subClauseParts = array(
+	#        'deleted = 0',
+	#        '(softref_key = "rtehtmlarea_images" OR softref_key = "typolink_tag")',
+	#        'ref_table = "sys_file"',
+	#        'tablename = "tt_content"',
+	#        'ref_uid = ' . $file->getUid(),
+	#    );
+	#
+	#    $rows = $this->getDatabaseConnection()->exec_SELECTquery(
+	#        'DISTINCT pid',
+	#        'tt_content',
+	#        sprintf('uid IN (SELECT recuid FROM sys_refindex WHERE %s) %s',
+	#            implode(' AND ', $subClauseParts),
+	#            $this->getWhereClauseForEnabledFields('tt_content')
+	#        )
+	#    );
+	#
+	#    // Compute result
+	#    $pages = [];
+	#    while ($affectedPage = $this->getDatabaseConnection()->sql_fetch_assoc($rows)) {
+	#        $pages[] = $affectedPage['pid'];
+	#    }
+	#
+	#    return $pages;
+	#}
+
+	/**
+	 * Get the WHERE clause for the enabled fields given a $tableName.
+	 *
+	 * @param string $tableName
+	 * @return string
+	 */
+	protected function getWhereClauseForEnabledFields($tableName)
+	{
+		if ($this->isFrontendMode()) {
+			// frontend context
+			$whereClause = $this->getPageRepository()->deleteClause($tableName);
+		} else {
+			// backend context
+			$whereClause = BackendUtility::deleteClause($tableName);
+		}
+		return $whereClause;
+	}
+
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return string
+	 */
+	protected function isFrontendMode()
+	{
+		return TYPO3_MODE == 'FE';
+	}
+
+	/**
+	 * Returns an instance of the page repository.
+	 *
+	 * @return \TYPO3\CMS\Frontend\Page\PageRepository
+	 */
+	protected function getPageRepository()
+	{
+		return $GLOBALS['TSFE']->sys_page;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @return \Fab\Media\Resource\FileReferenceService|object
+	 */
+	protected function getFileReferenceService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Resource\FileReferenceService::class);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
             ->groupBy('pid') // no support for distinct
             ->andWhere(
                 'pid > 0',
-                'uid_local = ' . $file->getUid()
+                'uid_local = '.$file->getUid()
             )
             ->execute()
             ->fetchAll();

Classes/Controller/ImageEditorController.php

Indentation +32 added lines, -32 removed lines

@@ -21,37 +21,37 @@
 class ImageEditorController extends ActionController
 {
 
-    /**
-     * Initializes the controller before invoking an action method.
-     */
-    public function initializeAction()
-    {
-        /** @var PageRenderer $pageRenderer */
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
-
-        // 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 inserting an image in the RTE.
-     *
-     * @param File $file
-     * @return void
-     */
-    public function showAction(File $file)
-    {
-        $this->view->assign('file', $file);
-        $moduleSignature = MediaModule::getSignature();
-        $this->view->assign('moduleUrl', BackendUtility::getModuleUrl($moduleSignature));
-    }
+	/**
+	 * Initializes the controller before invoking an action method.
+	 */
+	public function initializeAction()
+	{
+		/** @var PageRenderer $pageRenderer */
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
+
+		// 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 inserting an image in the RTE.
+	 *
+	 * @param File $file
+	 * @return void
+	 */
+	public function showAction(File $file)
+	{
+		$this->view->assign('file', $file);
+		$moduleSignature = MediaModule::getSignature();
+		$this->view->assign('moduleUrl', BackendUtility::getModuleUrl($moduleSignature));
+	}
 
 }

Classes/View/Checkbox/RecursiveCheckbox.php

Indentation +59 added lines, -59 removed lines

@@ -19,44 +19,44 @@ 
 class RecursiveCheckbox extends AbstractComponentView
 {
 
-    /**
-     * Renders a checkbox for recursive file browsing.
-     *
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    public function render()
-    {
+	/**
+	 * Renders a checkbox for recursive file browsing.
+	 *
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	public function render()
+	{
 
-        $output = '';
-        if ($this->isDisplayed()) {
-            $this->loadRequireJsCode();
-            $output = $this->renderRecursiveCheckbox();
-        }
+		$output = '';
+		if ($this->isDisplayed()) {
+			$this->loadRequireJsCode();
+			$output = $this->renderRecursiveCheckbox();
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 
-    /**
-     * @return string
-     * @throws \InvalidArgumentException
-     */
-    protected function isDisplayed()
-    {
-        $isDisplayed = $this->getMediaModule()->hasFolderTree();
-        if ($this->getModuleLoader()->hasPlugin()) {
-            $isDisplayed = false;
-        }
-        return $isDisplayed;
-    }
+	/**
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 */
+	protected function isDisplayed()
+	{
+		$isDisplayed = $this->getMediaModule()->hasFolderTree();
+		if ($this->getModuleLoader()->hasPlugin()) {
+			$isDisplayed = false;
+		}
+		return $isDisplayed;
+	}
 
-    /**
-     * @return string
-     */
-    protected function renderRecursiveCheckbox()
-    {
+	/**
+	 * @return string
+	 */
+	protected function renderRecursiveCheckbox()
+	{
 
-        $template = '<form action="%s" id="form-checkbox-hasRecursiveSelection" method="get">
+		$template = '<form action="%s" id="form-checkbox-hasRecursiveSelection" method="get">
 						<label>
 							<input type="checkbox"
 									name="%s[hasRecursiveSelection]"
@@ -67,35 +67,35 @@ 
 						</label>
 					</form>';
 
-        return sprintf(
-            $template,
-            $this->getModuleLoader()->getModuleUrl(),
-            $this->getModuleLoader()->getParameterPrefix(),
-            $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:browse_subfolders')
-        );
-    }
+		return sprintf(
+			$template,
+			$this->getModuleLoader()->getModuleUrl(),
+			$this->getModuleLoader()->getParameterPrefix(),
+			$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:browse_subfolders')
+		);
+	}
 
-    /**
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    protected function loadRequireJsCode()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+	/**
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 */
+	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/BrowseRecursively');
-    }
+		$configuration['paths']['Fab/Media'] = '../typo3conf/ext/media/Resources/Public/JavaScript';
+		$pageRenderer->addRequireJsConfiguration($configuration);
+		$pageRenderer->loadRequireJsModule('Fab/Media/BrowseRecursively');
+	}
 
 
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
-    }
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Module\MediaModule::class);
+	}
 
 }

Classes/View/Menu/StorageMenu.php

Indentation +111 added lines, -111 removed lines

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

Spacing +2 added lines, -3 removed lines

@@ -66,8 +66,7 @@ 
                 $selected,
                 $storage->getName(),
                 $storage->isOnline() ?
-                    '' :
-                    '(' . $this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline') . ')'
+                    '' : '('.$this->getLanguageService()->sL('LLL:EXT:media/Resources/Private/Language/locallang.xlf:offline').')'
             );
         }
 
@@ -75,7 +74,7 @@ 
         $inputs = '';
         foreach ($parameters as $parameter => $value) {
             list($parameter, $value) = $this->computeParameterAndValue($parameter, $value);
-            if ($parameter !== $this->getModuleLoader()->getParameterPrefix() . '[storage]') {
+            if ($parameter !== $this->getModuleLoader()->getParameterPrefix().'[storage]') {
                 $inputs .= sprintf('<input type="hidden" name="%s" value="%s" />', $parameter, $value);
             }
         }

Tests/Unit/Utility/PathTest.php

Spacing +4 added lines, -4 removed lines

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

Classes/View/Warning/ConfigurationWarning.php

Indentation +327 added lines, -327 removed lines

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

Spacing +3 added lines, -3 removed lines

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