fabarea / vidi

ext_tables.php

Indentation +160 added lines, -160 removed lines

@@ -1,179 +1,179 @@
 <?php
 
 if (!defined('TYPO3_MODE')) {
-    die ('Access denied.');
+	die ('Access denied.');
 }
 
 // Check from Vidi configuration what default module should be loaded.
 // Make sure the class exists to avoid a Runtime Error
 if (TYPO3_MODE === 'BE') {
 
-    // Add content main module before 'user'
-    if (!isset($GLOBALS['TBE_MODULES']['content'])) {
-
-        // Position module "content" after module "user" manually. No API is available for that, it seems...
-        $modules = [];
-        foreach ($GLOBALS['TBE_MODULES'] as $key => $val) {
-            if ($key === 'user') {
-                $modules['content'] = '';
-            }
-            $modules[$key] = $val;
-        }
-        $GLOBALS['TBE_MODULES'] = $modules;
-
-        // Register "data management" module.
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
-            'content',
-            '',
-            '',
-            '',
-            [
-                'name' => 'content',
-                'access' => 'user,group',
-                'labels' => [
-                    'll_ref' => 'LLL:EXT:vidi/Resources/Private/Language/content_module.xlf',
-                ],
-            ]
-        );
-    }
-
-    /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
-    $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Extbase\Object\ObjectManager');
-
-    /** @var \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility $configurationUtility */
-    $configurationUtility = $objectManager->get('TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility');
-    $configuration = $configurationUtility->getCurrentConfiguration('vidi');
-
-    $pids = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['default_pid']['value'], true);
-    $defaultPid = array_shift($pids);
-    $defaultPids = [];
-    foreach ($pids as $dataTypeAndPid) {
-        $parts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':', $dataTypeAndPid);
-        if (count($parts) === 2) {
-            $defaultPids[$parts[0]] = $parts[1];
-        }
-    }
-
-    // Loop around the data types and register them to be displayed within a BE module.
-    if ($configuration['data_types']['value']) {
-
-        $dataTypes = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['data_types']['value'], true);
-        foreach ($dataTypes as $dataType) {
-
-            /** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
-            $moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Fab\Vidi\Module\ModuleLoader', $dataType);
-
-            // Special case already defined in Vidi.
-            if ($dataType === 'fe_users') {
-                $languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_users.xlf';
-                $icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-frontend.svg';
-                $icon = 'EXT:vidi/Resources/Public/Images/fe_users.svg';
-            } elseif ($dataType === 'fe_groups') {
-                $languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_groups.xlf';
-                $icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-group-frontend.svg';
-                $icon = 'EXT:vidi/Resources/Public/Images/fe_groups.svg';
-            } else {
-                /** @var \Fab\Vidi\Backend\LanguageFileGenerator $languageService */
-                $languageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(Fab\Vidi\Backend\LanguageFileGenerator::class);
-                $languageFile = $languageService->generate($dataType);
-                $icon = '';
-            }
-
-            $pid = isset($defaultPids[$dataType]) ? $defaultPids[$dataType] : $defaultPid;
-
-            /** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
-            $moduleLoader->setIcon($icon)
-                ->setModuleLanguageFile($languageFile)
-                ->setDefaultPid($pid)
-                ->register();
-        }
-    }
-
-    // Possible Static TS loading
-    if (true === isset($configuration['autoload_typoscript']['value']) && false === (bool)$configuration['autoload_typoscript']['value']) {
-        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('vidi', 'Configuration/TypoScript', 'Vidi: versatile and interactive display');
-    }
-
-    // Register List2 only if beta feature is enabled.
-    // @todo let see what we do with that
-    #if ($configuration['activate_beta_features']['value']) {
-    #	$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
-    #
-    #	if (!$configuration['hide_module_list']['value']) {
-    #		$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module_transitional.xlf';
-    #	}
-    #
-    #	\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
-    #		'vidi',
-    #		'web', // Make module a submodule of 'web'
-    #		'm1', // Submodule key
-    #		'after:list', // Position
-    #		array(
-    #			'Content' => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
-    #			'Tool' => 'welcome, work',
-    #			'Facet' => 'autoSuggest, autoSuggests',
-    #			'Selection' => 'edit, update, create, delete, list, show',
-    #			'UserPreferences' => 'save',
-    #			'Clipboard' => 'save, flush, show',
-    #		), array(
-    #			'access' => 'user,group',
-    #			'icon' => 'EXT:vidi/Resources/Public/Images/list.png',
-    #			'labels' => $labelFile,
-    #		)
-    #	);
-    #}
-    #if ($configuration['hide_module_list']['value']) {
-    #
-    #	// Default User TSConfig to be added in any case.
-    #	TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
-    #
-    #		# Hide the module in the BE.
-    #		options.hideModules.web := addToList(list)
-    #	');
-    #}
-
-    /** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
-    $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Extbase\Object\ObjectManager');
-
-    /** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
-    $signalSlotDispatcher = $objectManager->get('TYPO3\CMS\Extbase\SignalSlot\Dispatcher');
-
-    // Connect "processContentData" signal slot with the "ContentObjectProcessor".
-    $signalSlotDispatcher->connect(
-        'Fab\Vidi\Controller\Backend\ContentController',
-        'processContentData',
-        'Fab\Vidi\Processor\ContentObjectProcessor',
-        'processRelations',
-        true
-    );
-
-    // Connect "processContentData" signal with the "MarkerProcessor".
-    $signalSlotDispatcher->connect(
-        'Fab\Vidi\Controller\Backend\ContentController',
-        'processContentData',
-        'Fab\Vidi\Processor\MarkerProcessor',
-        'processMarkers',
-        true
-    );
-
-    // Register default Tools for Vidi.
-    \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\ModulePreferencesTool');
-    \Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\RelationAnalyserTool');
+	// Add content main module before 'user'
+	if (!isset($GLOBALS['TBE_MODULES']['content'])) {
+
+		// Position module "content" after module "user" manually. No API is available for that, it seems...
+		$modules = [];
+		foreach ($GLOBALS['TBE_MODULES'] as $key => $val) {
+			if ($key === 'user') {
+				$modules['content'] = '';
+			}
+			$modules[$key] = $val;
+		}
+		$GLOBALS['TBE_MODULES'] = $modules;
+
+		// Register "data management" module.
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+			'content',
+			'',
+			'',
+			'',
+			[
+				'name' => 'content',
+				'access' => 'user,group',
+				'labels' => [
+					'll_ref' => 'LLL:EXT:vidi/Resources/Private/Language/content_module.xlf',
+				],
+			]
+		);
+	}
+
+	/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
+	$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Extbase\Object\ObjectManager');
+
+	/** @var \TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility $configurationUtility */
+	$configurationUtility = $objectManager->get('TYPO3\CMS\Extensionmanager\Utility\ConfigurationUtility');
+	$configuration = $configurationUtility->getCurrentConfiguration('vidi');
+
+	$pids = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['default_pid']['value'], true);
+	$defaultPid = array_shift($pids);
+	$defaultPids = [];
+	foreach ($pids as $dataTypeAndPid) {
+		$parts = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(':', $dataTypeAndPid);
+		if (count($parts) === 2) {
+			$defaultPids[$parts[0]] = $parts[1];
+		}
+	}
+
+	// Loop around the data types and register them to be displayed within a BE module.
+	if ($configuration['data_types']['value']) {
+
+		$dataTypes = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $configuration['data_types']['value'], true);
+		foreach ($dataTypes as $dataType) {
+
+			/** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
+			$moduleLoader = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Fab\Vidi\Module\ModuleLoader', $dataType);
+
+			// Special case already defined in Vidi.
+			if ($dataType === 'fe_users') {
+				$languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_users.xlf';
+				$icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-frontend.svg';
+				$icon = 'EXT:vidi/Resources/Public/Images/fe_users.svg';
+			} elseif ($dataType === 'fe_groups') {
+				$languageFile = 'LLL:EXT:vidi/Resources/Private/Language/fe_groups.xlf';
+				$icon = 'EXT:core/Resources/Public/Icons/T3Icons/status/status-user-group-frontend.svg';
+				$icon = 'EXT:vidi/Resources/Public/Images/fe_groups.svg';
+			} else {
+				/** @var \Fab\Vidi\Backend\LanguageFileGenerator $languageService */
+				$languageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(Fab\Vidi\Backend\LanguageFileGenerator::class);
+				$languageFile = $languageService->generate($dataType);
+				$icon = '';
+			}
+
+			$pid = isset($defaultPids[$dataType]) ? $defaultPids[$dataType] : $defaultPid;
+
+			/** @var \Fab\Vidi\Module\ModuleLoader $moduleLoader */
+			$moduleLoader->setIcon($icon)
+				->setModuleLanguageFile($languageFile)
+				->setDefaultPid($pid)
+				->register();
+		}
+	}
+
+	// Possible Static TS loading
+	if (true === isset($configuration['autoload_typoscript']['value']) && false === (bool)$configuration['autoload_typoscript']['value']) {
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile('vidi', 'Configuration/TypoScript', 'Vidi: versatile and interactive display');
+	}
+
+	// Register List2 only if beta feature is enabled.
+	// @todo let see what we do with that
+	#if ($configuration['activate_beta_features']['value']) {
+	#	$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module.xlf';
+	#
+	#	if (!$configuration['hide_module_list']['value']) {
+	#		$labelFile = 'LLL:EXT:vidi/Resources/Private/Language/locallang_module_transitional.xlf';
+	#	}
+	#
+	#	\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
+	#		'vidi',
+	#		'web', // Make module a submodule of 'web'
+	#		'm1', // Submodule key
+	#		'after:list', // Position
+	#		array(
+	#			'Content' => 'index, list, delete, update, edit, copy, move, localize, sort, copyClipboard, moveClipboard',
+	#			'Tool' => 'welcome, work',
+	#			'Facet' => 'autoSuggest, autoSuggests',
+	#			'Selection' => 'edit, update, create, delete, list, show',
+	#			'UserPreferences' => 'save',
+	#			'Clipboard' => 'save, flush, show',
+	#		), array(
+	#			'access' => 'user,group',
+	#			'icon' => 'EXT:vidi/Resources/Public/Images/list.png',
+	#			'labels' => $labelFile,
+	#		)
+	#	);
+	#}
+	#if ($configuration['hide_module_list']['value']) {
+	#
+	#	// Default User TSConfig to be added in any case.
+	#	TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addUserTSConfig('
+	#
+	#		# Hide the module in the BE.
+	#		options.hideModules.web := addToList(list)
+	#	');
+	#}
+
+	/** @var \TYPO3\CMS\Extbase\Object\ObjectManager $objectManager */
+	$objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Extbase\Object\ObjectManager');
+
+	/** @var $signalSlotDispatcher \TYPO3\CMS\Extbase\SignalSlot\Dispatcher */
+	$signalSlotDispatcher = $objectManager->get('TYPO3\CMS\Extbase\SignalSlot\Dispatcher');
+
+	// Connect "processContentData" signal slot with the "ContentObjectProcessor".
+	$signalSlotDispatcher->connect(
+		'Fab\Vidi\Controller\Backend\ContentController',
+		'processContentData',
+		'Fab\Vidi\Processor\ContentObjectProcessor',
+		'processRelations',
+		true
+	);
+
+	// Connect "processContentData" signal with the "MarkerProcessor".
+	$signalSlotDispatcher->connect(
+		'Fab\Vidi\Controller\Backend\ContentController',
+		'processContentData',
+		'Fab\Vidi\Processor\MarkerProcessor',
+		'processMarkers',
+		true
+	);
+
+	// Register default Tools for Vidi.
+	\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\ModulePreferencesTool');
+	\Fab\Vidi\Tool\ToolRegistry::getInstance()->register('*', 'Fab\Vidi\Tool\RelationAnalyserTool');
 }
 
 // Add new sprite icon.
 $icons = [
-    'go' => 'EXT:' . $_EXTKEY . '/Resources/Public/Images/bullet_go.png',
-    'query' => 'EXT:' . $_EXTKEY . '/Resources/Public/Images/drive_disk.png',
+	'go' => 'EXT:' . $_EXTKEY . '/Resources/Public/Images/bullet_go.png',
+	'query' => 'EXT:' . $_EXTKEY . '/Resources/Public/Images/drive_disk.png',
 ];
 /** @var \TYPO3\CMS\Core\Imaging\IconRegistry $iconRegistry */
 $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
 foreach ($icons as $key => $icon) {
-    $iconRegistry->registerIcon('extensions-' . $_EXTKEY . '-' . $key,
-        \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
-        [
-            'source' => $icon
-        ]
-    );
+	$iconRegistry->registerIcon('extensions-' . $_EXTKEY . '-' . $key,
+		\TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider::class,
+		[
+			'source' => $icon
+		]
+	);
 }
 unset($iconRegistry);

Classes/ViewHelpers/Link/BackViewHelper.php

Indentation +23 added lines, -23 removed lines

@@ -19,30 +19,30 @@
 class BackViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Returns the "back" buttons to be placed in the doc header.
-     *
-     * @return string
-     */
-    public function render()
-    {
+	/**
+	 * Returns the "back" buttons to be placed in the doc header.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
 
-        $result = '';
-        if (GeneralUtility::_GET('returnUrl')) {
-            $result = sprintf('<a href="%s" class="btn btn-default btn-sm btn-return-top">%s</a>',
-                GeneralUtility::_GP('returnUrl'),
-                $this->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL)
-            );
-        }
+		$result = '';
+		if (GeneralUtility::_GET('returnUrl')) {
+			$result = sprintf('<a href="%s" class="btn btn-default btn-sm btn-return-top">%s</a>',
+				GeneralUtility::_GP('returnUrl'),
+				$this->getIconFactory()->getIcon('actions-document-close', Icon::SIZE_SMALL)
+			);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * @return IconFactory
-     */
-    protected function getIconFactory()
-    {
-        return GeneralUtility::makeInstance(IconFactory::class);
-    }
+	/**
+	 * @return IconFactory
+	 */
+	protected function getIconFactory()
+	{
+		return GeneralUtility::makeInstance(IconFactory::class);
+	}
 }

Classes/ViewHelpers/Result/ToJsonViewHelper.php

Indentation +49 added lines, -49 removed lines

@@ -18,58 +18,58 @@
 class ToJsonViewHelper extends AbstractViewHelper
 {
 
-    /**
-     * Render a Json response
-     *
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    public function render()
-    {
+	/**
+	 * Render a Json response
+	 *
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	public function render()
+	{
 
-        $objects = $this->templateVariableContainer->get('objects');
-        $columns = $this->templateVariableContainer->get('columns');
-        $output = array(
-            'sEcho' => $this->getNextTransactionId(),
-            'iTotalRecords' => $this->templateVariableContainer->get('numberOfObjects'),
-            'iTotalDisplayRecords' => $this->templateVariableContainer->get('numberOfObjects'),
-            'iNumberOfRecords' => count($objects),
-            'aaData' => $this->getRowsViewHelper()->render($objects, $columns),
-        );
+		$objects = $this->templateVariableContainer->get('objects');
+		$columns = $this->templateVariableContainer->get('columns');
+		$output = array(
+			'sEcho' => $this->getNextTransactionId(),
+			'iTotalRecords' => $this->templateVariableContainer->get('numberOfObjects'),
+			'iTotalDisplayRecords' => $this->templateVariableContainer->get('numberOfObjects'),
+			'iNumberOfRecords' => count($objects),
+			'aaData' => $this->getRowsViewHelper()->render($objects, $columns),
+		);
 
-        $this->setHttpHeaders();
-        print json_encode($output);
-    }
+		$this->setHttpHeaders();
+		print json_encode($output);
+	}
 
-    /**
-     * @return int
-     */
-    protected function getNextTransactionId()
-    {
-        $transaction = 0;
-        if (GeneralUtility::_GET('sEcho')) {
-            $transaction = (int)GeneralUtility::_GET('sEcho') + 1;
-        }
-        return $transaction;
-    }
+	/**
+	 * @return int
+	 */
+	protected function getNextTransactionId()
+	{
+		$transaction = 0;
+		if (GeneralUtility::_GET('sEcho')) {
+			$transaction = (int)GeneralUtility::_GET('sEcho') + 1;
+		}
+		return $transaction;
+	}
 
-    /**
-     * @return void
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     * @throws \InvalidArgumentException
-     */
-    protected function setHttpHeaders()
-    {
-        /** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->setHeader('Content-Type', 'application/json');
-        $response->sendHeaders();
-    }
+	/**
+	 * @return void
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 * @throws \InvalidArgumentException
+	 */
+	protected function setHttpHeaders()
+	{
+		/** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->setHeader('Content-Type', 'application/json');
+		$response->sendHeaders();
+	}
 
-    /**
-     * @return RowsViewHelper
-     */
-    protected function getRowsViewHelper()
-    {
-        return $this->objectManager->get(RowsViewHelper::class);
-    }
+	/**
+	 * @return RowsViewHelper
+	 */
+	protected function getRowsViewHelper()
+	{
+		return $this->objectManager->get(RowsViewHelper::class);
+	}
 }

Classes/ViewHelpers/Result/ToXmlViewHelper.php

Indentation +106 added lines, -106 removed lines

@@ -16,120 +16,120 @@
 class ToXmlViewHelper extends AbstractToFormatViewHelper
 {
 
-    /**
-     * Render an XML export.
-     *
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    public function render()
-    {
-
-        $objects = $this->templateVariableContainer->get('objects');
-
-        // Make sure we have something to process...
-        if (!empty($objects)) {
-
-            // Initialization step.
-            $this->initializeEnvironment($objects);
-            $this->exportFileNameAndPath .= '.xml'; // add extension to the file.
-
-            // Write the exported data to a XML file.
-            $this->writeXmlFile($objects);
-
-            // We must generate a zip archive since there are files included.
-            if ($this->hasCollectedFiles()) {
-
-                $this->writeZipFile();
-                $this->sendZipHttpHeaders();
-
-                readfile($this->zipFileNameAndPath);
-            } else {
-                $this->sendXmlHttpHeaders();
-                readfile($this->exportFileNameAndPath);
-            }
-
-            GeneralUtility::rmdir($this->temporaryDirectory, true);
-        }
-    }
-
-    /**
-     * Write the XML file to a temporary location.
-     *
-     * @param array $objects
-     * @return void
-     */
-    protected function writeXmlFile(array $objects)
-    {
-
-        // Get first object of $objects to check whether it contains possible files to include.
-        /** @var \Fab\Vidi\Domain\Model\Content $object */
-        $object = reset($objects);
-        $this->checkWhetherObjectMayIncludeFiles($object);
-
-        $items = [];
-        foreach ($objects as $object) {
-            if ($this->hasFileFields()) {
-                $this->collectFiles($object);
-            }
-            $items[] = $object->toValues();
-        }
-
-        $xml = new \SimpleXMLElement('<items/>');
-        $xml = $this->arrayToXml($items, $xml);
-        file_put_contents($this->exportFileNameAndPath, $this->formatXml($xml->asXML()));
-    }
-
-    /*
+	/**
+	 * Render an XML export.
+	 *
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	public function render()
+	{
+
+		$objects = $this->templateVariableContainer->get('objects');
+
+		// Make sure we have something to process...
+		if (!empty($objects)) {
+
+			// Initialization step.
+			$this->initializeEnvironment($objects);
+			$this->exportFileNameAndPath .= '.xml'; // add extension to the file.
+
+			// Write the exported data to a XML file.
+			$this->writeXmlFile($objects);
+
+			// We must generate a zip archive since there are files included.
+			if ($this->hasCollectedFiles()) {
+
+				$this->writeZipFile();
+				$this->sendZipHttpHeaders();
+
+				readfile($this->zipFileNameAndPath);
+			} else {
+				$this->sendXmlHttpHeaders();
+				readfile($this->exportFileNameAndPath);
+			}
+
+			GeneralUtility::rmdir($this->temporaryDirectory, true);
+		}
+	}
+
+	/**
+	 * Write the XML file to a temporary location.
+	 *
+	 * @param array $objects
+	 * @return void
+	 */
+	protected function writeXmlFile(array $objects)
+	{
+
+		// Get first object of $objects to check whether it contains possible files to include.
+		/** @var \Fab\Vidi\Domain\Model\Content $object */
+		$object = reset($objects);
+		$this->checkWhetherObjectMayIncludeFiles($object);
+
+		$items = [];
+		foreach ($objects as $object) {
+			if ($this->hasFileFields()) {
+				$this->collectFiles($object);
+			}
+			$items[] = $object->toValues();
+		}
+
+		$xml = new \SimpleXMLElement('<items/>');
+		$xml = $this->arrayToXml($items, $xml);
+		file_put_contents($this->exportFileNameAndPath, $this->formatXml($xml->asXML()));
+	}
+
+	/*
      * Convert an array to xml
      *
      * @return \SimpleXMLElement
      */
-    protected function arrayToXml($array, \SimpleXMLElement $xml)
-    {
-        foreach ($array as $key => $value) {
-            if (is_array($value)) {
-                $key = is_numeric($key) ? 'item' : $key;
-                $subNode = $xml->addChild($key);
-                $this->arrayToXml($value, $subNode);
-            } else {
-                $key = is_numeric($key) ? 'item' : $key;
-                $xml->addChild($key, "$value");
-            }
-        }
-        return $xml;
-    }
-
-    /*
+	protected function arrayToXml($array, \SimpleXMLElement $xml)
+	{
+		foreach ($array as $key => $value) {
+			if (is_array($value)) {
+				$key = is_numeric($key) ? 'item' : $key;
+				$subNode = $xml->addChild($key);
+				$this->arrayToXml($value, $subNode);
+			} else {
+				$key = is_numeric($key) ? 'item' : $key;
+				$xml->addChild($key, "$value");
+			}
+		}
+		return $xml;
+	}
+
+	/*
      * Format the XML so that is looks human friendly.
      *
      * @param string $xml
      * @return string
      */
-    protected function formatXml($xml)
-    {
-        $dom = new \DOMDocument("1.0");
-        $dom->preserveWhiteSpace = false;
-        $dom->formatOutput = true;
-        $dom->loadXML($xml);
-        return $dom->saveXML();
-    }
-
-    /**
-     * @return void
-     * @throws \InvalidArgumentException
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    protected function sendXmlHttpHeaders()
-    {
-
-        /** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->setHeader('Content-Type', 'application/xml');
-        $response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
-        $response->setHeader('Content-Length', filesize($this->exportFileNameAndPath));
-        $response->setHeader('Content-Description', 'File Transfer');
-
-        $response->sendHeaders();
-    }
+	protected function formatXml($xml)
+	{
+		$dom = new \DOMDocument("1.0");
+		$dom->preserveWhiteSpace = false;
+		$dom->formatOutput = true;
+		$dom->loadXML($xml);
+		return $dom->saveXML();
+	}
+
+	/**
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	protected function sendXmlHttpHeaders()
+	{
+
+		/** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->setHeader('Content-Type', 'application/xml');
+		$response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+		$response->setHeader('Content-Length', filesize($this->exportFileNameAndPath));
+		$response->setHeader('Content-Description', 'File Transfer');
+
+		$response->sendHeaders();
+	}
 
 }

Classes/ViewHelpers/Result/ToCsvViewHelper.php

Indentation +94 added lines, -94 removed lines

@@ -16,99 +16,99 @@
 class ToCsvViewHelper extends AbstractToFormatViewHelper
 {
 
-    /**
-     * Render a CSV export request.
-     *
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    public function render()
-    {
-
-        $objects = $this->templateVariableContainer->get('objects');
-
-        // Make sure we have something to process...
-        if (!empty($objects)) {
-
-            // Initialization step.
-            $this->initializeEnvironment($objects);
-            $this->exportFileNameAndPath .= '.csv'; // add extension to the file.
-
-            // Write the exported data to a CSV file.
-            $this->writeCsvFile($objects);
-
-            // We must generate a zip archive since there are files included.
-            if ($this->hasCollectedFiles()) {
-
-                $this->writeZipFile();
-                $this->sendZipHttpHeaders();
-
-                readfile($this->zipFileNameAndPath);
-            } else {
-                $this->sendCsvHttpHeaders();
-                readfile($this->exportFileNameAndPath);
-            }
-
-            GeneralUtility::rmdir($this->temporaryDirectory, true);
-        }
-    }
-
-    /**
-     * Write the CSV file to a temporary location.
-     *
-     * @param array $objects
-     * @return void
-     * @throws \Exception
-     */
-    protected function writeCsvFile(array $objects)
-    {
-
-        // Create a file pointer
-        $output = fopen($this->exportFileNameAndPath, 'w');
-
-        // Handle CSV header, get the first object and get the list of fields.
-        /** @var \Fab\Vidi\Domain\Model\Content $object */
-        $object = reset($objects);
-        fputcsv($output, $object->toFields());
-        $this->checkWhetherObjectMayIncludeFiles($object);
-
-        foreach ($objects as $object) {
-            if ($this->hasFileFields()) {
-                $this->collectFiles($object);
-            }
-
-            // Make sure we have a flat array of values for the CSV purpose.
-            $flattenValues = [];
-            foreach ($object->toValues() as $fieldName => $value) {
-                if (is_array($value)) {
-                    $flattenValues[$fieldName] = implode(', ', $value);
-                } else {
-                    $flattenValues[$fieldName] = str_replace("\n", "\r", $value); // for Excel purpose.
-                }
-            }
-
-            fputcsv($output, $flattenValues);
-        }
-
-        // close file handler
-        fclose($output);
-    }
-
-    /**
-     * @return void
-     * @throws \InvalidArgumentException
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    protected function sendCsvHttpHeaders()
-    {
-
-        /** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->setHeader('Content-Type', 'application/csv');
-        $response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
-        $response->setHeader('Content-Length', filesize($this->exportFileNameAndPath));
-        $response->setHeader('Content-Description', 'File Transfer');
-
-        $response->sendHeaders();
-    }
+	/**
+	 * Render a CSV export request.
+	 *
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	public function render()
+	{
+
+		$objects = $this->templateVariableContainer->get('objects');
+
+		// Make sure we have something to process...
+		if (!empty($objects)) {
+
+			// Initialization step.
+			$this->initializeEnvironment($objects);
+			$this->exportFileNameAndPath .= '.csv'; // add extension to the file.
+
+			// Write the exported data to a CSV file.
+			$this->writeCsvFile($objects);
+
+			// We must generate a zip archive since there are files included.
+			if ($this->hasCollectedFiles()) {
+
+				$this->writeZipFile();
+				$this->sendZipHttpHeaders();
+
+				readfile($this->zipFileNameAndPath);
+			} else {
+				$this->sendCsvHttpHeaders();
+				readfile($this->exportFileNameAndPath);
+			}
+
+			GeneralUtility::rmdir($this->temporaryDirectory, true);
+		}
+	}
+
+	/**
+	 * Write the CSV file to a temporary location.
+	 *
+	 * @param array $objects
+	 * @return void
+	 * @throws \Exception
+	 */
+	protected function writeCsvFile(array $objects)
+	{
+
+		// Create a file pointer
+		$output = fopen($this->exportFileNameAndPath, 'w');
+
+		// Handle CSV header, get the first object and get the list of fields.
+		/** @var \Fab\Vidi\Domain\Model\Content $object */
+		$object = reset($objects);
+		fputcsv($output, $object->toFields());
+		$this->checkWhetherObjectMayIncludeFiles($object);
+
+		foreach ($objects as $object) {
+			if ($this->hasFileFields()) {
+				$this->collectFiles($object);
+			}
+
+			// Make sure we have a flat array of values for the CSV purpose.
+			$flattenValues = [];
+			foreach ($object->toValues() as $fieldName => $value) {
+				if (is_array($value)) {
+					$flattenValues[$fieldName] = implode(', ', $value);
+				} else {
+					$flattenValues[$fieldName] = str_replace("\n", "\r", $value); // for Excel purpose.
+				}
+			}
+
+			fputcsv($output, $flattenValues);
+		}
+
+		// close file handler
+		fclose($output);
+	}
+
+	/**
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	protected function sendCsvHttpHeaders()
+	{
+
+		/** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->setHeader('Content-Type', 'application/csv');
+		$response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+		$response->setHeader('Content-Length', filesize($this->exportFileNameAndPath));
+		$response->setHeader('Content-Description', 'File Transfer');
+
+		$response->sendHeaders();
+	}
 
 }

Classes/ViewHelpers/Result/ToXlsViewHelper.php

Indentation +98 added lines, -98 removed lines

@@ -17,103 +17,103 @@
 class ToXlsViewHelper extends AbstractToFormatViewHelper
 {
 
-    /**
-     * Render a XLS export request.
-     *
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    public function render()
-    {
-
-        $objects = $this->templateVariableContainer->get('objects');
-
-        // Make sure we have something to process...
-        if (!empty($objects)) {
-
-            // Initialization step.
-            $this->initializeEnvironment($objects);
-            $this->exportFileNameAndPath .= '.xls'; // add extension to the file.
-
-            // Write the exported data to a CSV file.
-            $this->writeXlsFile($objects);
-
-            // We must generate a zip archive since there are files included.
-            if ($this->hasCollectedFiles()) {
-
-                $this->writeZipFile();
-                $this->sendZipHttpHeaders();
-
-                readfile($this->zipFileNameAndPath);
-            } else {
-                $this->sendXlsHttpHeaders();
-                readfile($this->exportFileNameAndPath);
-            }
-
-            GeneralUtility::rmdir($this->temporaryDirectory, true);
-        }
-    }
-
-    /**
-     * Write the CSV file to a temporary location.
-     *
-     * @param array $objects
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    protected function writeXlsFile(array $objects)
-    {
-
-        /** @var SpreadSheetService $spreadSheet */
-        $spreadSheet = GeneralUtility::makeInstance(SpreadSheetService::class);
-
-        // Handle object header, get the first object and get the list of fields.
-        /** @var \Fab\Vidi\Domain\Model\Content $object */
-        $object = reset($objects);
-        $spreadSheet->addRow($object->toFields());
-
-        $this->checkWhetherObjectMayIncludeFiles($object);
-
-        foreach ($objects as $object) {
-            if ($this->hasFileFields()) {
-                $this->collectFiles($object);
-            }
-
-            // Make sure we have a flat array of values for the CSV purpose.
-            $flattenValues = [];
-            foreach ($object->toValues() as $fieldName => $value) {
-                if (is_array($value)) {
-                    $flattenValues[$fieldName] = implode(', ', $value);
-                } else {
-                    $flattenValues[$fieldName] = $value;
-                }
-            }
-
-            $spreadSheet->addRow($flattenValues);
-        }
-
-        file_put_contents($this->exportFileNameAndPath, $spreadSheet->toString());
-    }
-
-    /**
-     * @return void
-     * @throws \InvalidArgumentException
-     * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
-     */
-    protected function sendXlsHttpHeaders()
-    {
-
-        /** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
-        $response = $this->templateVariableContainer->get('response');
-        $response->setHeader('Pragma', 'public');
-        $response->setHeader('Expires', '0');
-        $response->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
-        $response->setHeader('Content-Type', 'application/vnd.ms-excel');
-        $response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
-        $response->setHeader('Content-Length', filesize($this->exportFileNameAndPath));
-        $response->setHeader('Content-Description', 'File Transfer');
-        $response->setHeader('Content-Transfer-Encoding', 'binary');
-
-        $response->sendHeaders();
-    }
+	/**
+	 * Render a XLS export request.
+	 *
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	public function render()
+	{
+
+		$objects = $this->templateVariableContainer->get('objects');
+
+		// Make sure we have something to process...
+		if (!empty($objects)) {
+
+			// Initialization step.
+			$this->initializeEnvironment($objects);
+			$this->exportFileNameAndPath .= '.xls'; // add extension to the file.
+
+			// Write the exported data to a CSV file.
+			$this->writeXlsFile($objects);
+
+			// We must generate a zip archive since there are files included.
+			if ($this->hasCollectedFiles()) {
+
+				$this->writeZipFile();
+				$this->sendZipHttpHeaders();
+
+				readfile($this->zipFileNameAndPath);
+			} else {
+				$this->sendXlsHttpHeaders();
+				readfile($this->exportFileNameAndPath);
+			}
+
+			GeneralUtility::rmdir($this->temporaryDirectory, true);
+		}
+	}
+
+	/**
+	 * Write the CSV file to a temporary location.
+	 *
+	 * @param array $objects
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 */
+	protected function writeXlsFile(array $objects)
+	{
+
+		/** @var SpreadSheetService $spreadSheet */
+		$spreadSheet = GeneralUtility::makeInstance(SpreadSheetService::class);
+
+		// Handle object header, get the first object and get the list of fields.
+		/** @var \Fab\Vidi\Domain\Model\Content $object */
+		$object = reset($objects);
+		$spreadSheet->addRow($object->toFields());
+
+		$this->checkWhetherObjectMayIncludeFiles($object);
+
+		foreach ($objects as $object) {
+			if ($this->hasFileFields()) {
+				$this->collectFiles($object);
+			}
+
+			// Make sure we have a flat array of values for the CSV purpose.
+			$flattenValues = [];
+			foreach ($object->toValues() as $fieldName => $value) {
+				if (is_array($value)) {
+					$flattenValues[$fieldName] = implode(', ', $value);
+				} else {
+					$flattenValues[$fieldName] = $value;
+				}
+			}
+
+			$spreadSheet->addRow($flattenValues);
+		}
+
+		file_put_contents($this->exportFileNameAndPath, $spreadSheet->toString());
+	}
+
+	/**
+	 * @return void
+	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception\InvalidVariableException
+	 */
+	protected function sendXlsHttpHeaders()
+	{
+
+		/** @var \TYPO3\CMS\Extbase\Mvc\Web\Response $response */
+		$response = $this->templateVariableContainer->get('response');
+		$response->setHeader('Pragma', 'public');
+		$response->setHeader('Expires', '0');
+		$response->setHeader('Cache-Control', 'must-revalidate, post-check=0, pre-check=0');
+		$response->setHeader('Content-Type', 'application/vnd.ms-excel');
+		$response->setHeader('Content-Disposition', 'attachment; filename="' . basename($this->exportFileNameAndPath) . '"');
+		$response->setHeader('Content-Length', filesize($this->exportFileNameAndPath));
+		$response->setHeader('Content-Description', 'File Transfer');
+		$response->setHeader('Content-Transfer-Encoding', 'binary');
+
+		$response->sendHeaders();
+	}
 
 }

Classes/Domain/Repository/SelectionRepository.php

Indentation +62 added lines, -62 removed lines

@@ -19,76 +19,76 @@
 class SelectionRepository extends Repository
 {
 
-    /**
-     * @param string $dataType
-     * @return QueryResult
-     */
-    public function findByDataTypeForCurrentBackendUser($dataType)
-    {
-        $query = $this->createQuery();
+	/**
+	 * @param string $dataType
+	 * @return QueryResult
+	 */
+	public function findByDataTypeForCurrentBackendUser($dataType)
+	{
+		$query = $this->createQuery();
 
-        // Compute the OR part
-        if ($this->getBackendUser()->isAdmin()) {
-            $logicalOr = $query->logicalOr(
-                $query->equals('visibility', Selection::VISIBILITY_EVERYONE),
-                $query->equals('visibility', Selection::VISIBILITY_ADMIN_ONLY),
-                $query->equals('cruser_id', $this->getBackendUser()->user['uid'])
-            );
-        } else {
-            $logicalOr = $query->logicalOr(
-                $query->equals('visibility', Selection::VISIBILITY_EVERYONE),
-                $query->equals('cruser_id', $this->getBackendUser()->user['uid'])
-            );
-        }
+		// Compute the OR part
+		if ($this->getBackendUser()->isAdmin()) {
+			$logicalOr = $query->logicalOr(
+				$query->equals('visibility', Selection::VISIBILITY_EVERYONE),
+				$query->equals('visibility', Selection::VISIBILITY_ADMIN_ONLY),
+				$query->equals('cruser_id', $this->getBackendUser()->user['uid'])
+			);
+		} else {
+			$logicalOr = $query->logicalOr(
+				$query->equals('visibility', Selection::VISIBILITY_EVERYONE),
+				$query->equals('cruser_id', $this->getBackendUser()->user['uid'])
+			);
+		}
 
-        // Add matching criteria
-        $query->matching(
-            $query->logicalAnd(
-                $query->equals('dataType', $dataType),
-                $logicalOr
-            )
-        );
+		// Add matching criteria
+		$query->matching(
+			$query->logicalAnd(
+				$query->equals('dataType', $dataType),
+				$logicalOr
+			)
+		);
 
-        // Set ordering
-        $query->setOrderings(
-            array('name' => QueryInterface::ORDER_ASCENDING)
-        );
+		// Set ordering
+		$query->setOrderings(
+			array('name' => QueryInterface::ORDER_ASCENDING)
+		);
 
-        return $query->execute();
-    }
+		return $query->execute();
+	}
 
-    /**
-     * @param string $dataType
-     * @return QueryResult
-     */
-    public function findForEveryone($dataType)
-    {
-        $query = $this->createQuery();
+	/**
+	 * @param string $dataType
+	 * @return QueryResult
+	 */
+	public function findForEveryone($dataType)
+	{
+		$query = $this->createQuery();
 
-        // Add matching criteria
-        $query->matching(
-            $query->logicalAnd(
-                $query->equals('dataType', $dataType),
-                $query->equals('visibility', Selection::VISIBILITY_EVERYONE)
-            )
-        );
+		// Add matching criteria
+		$query->matching(
+			$query->logicalAnd(
+				$query->equals('dataType', $dataType),
+				$query->equals('visibility', Selection::VISIBILITY_EVERYONE)
+			)
+		);
 
-        // Set ordering
-        $query->setOrderings(
-            array('name' => QueryInterface::ORDER_ASCENDING)
-        );
+		// Set ordering
+		$query->setOrderings(
+			array('name' => QueryInterface::ORDER_ASCENDING)
+		);
 
-        return $query->execute();
-    }
+		return $query->execute();
+	}
 
-    /**
-     * Returns an instance of the current Backend User.
-     *
-     * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
-     */
-    protected function getBackendUser()
-    {
-        return $GLOBALS['BE_USER'];
-    }
+	/**
+	 * Returns an instance of the current Backend User.
+	 *
+	 * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+	 */
+	protected function getBackendUser()
+	{
+		return $GLOBALS['BE_USER'];
+	}
 
 }
\ No newline at end of file

Classes/View/Check/PidCheck.php

Indentation +194 added lines, -194 removed lines

@@ -20,75 +20,75 @@ 
 class PidCheck extends AbstractComponentView
 {
 
-    /**
-     * The data type (table)
-     *
-     * @var string
-     */
-    protected $dataType = '';
-
-    /**
-     * The configured pid for the data type
-     *
-     * @var int
-     */
-    protected $configuredPid = 0;
-
-    /**
-     * The page record of the configured pid
-     *
-     * @var array
-     */
-    protected $page = null;
-
-    /**
-     * A collection of speaking error messages why the pid is invalid.
-     *
-     * @var array
-     */
-    protected $errors = [];
-
-    /**
-     * Pseudo-Constructor, which ensures all dependencies are injected when called.
-     */
-    public function initializeObject()
-    {
-        $this->dataType = $this->getModuleLoader()->getDataType();
-        $this->configuredPid = $this->getConfiguredPid();
-    }
-
-    /**
-     * Renders warnings if storagePid is not properly configured.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $result = '';
-
-        $this->validateRootLevel();
-        $this->validatePageExist();
-        $this->validateDoktype();
-
-        if (!empty($this->errors)) {
-            $result .= $this->formatMessagePidIsNotValid();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Format a message whenever the storage is offline.
-     *
-     * @return string
-     */
-    protected function formatMessagePidIsNotValid()
-    {
-
-        // TODO: after dropping typo3 7.6 support, remove class: typo3-message message-warning message-header message-body
-
-        $error = implode('<br />', $this->errors);
-        $result = <<< EOF
+	/**
+	 * The data type (table)
+	 *
+	 * @var string
+	 */
+	protected $dataType = '';
+
+	/**
+	 * The configured pid for the data type
+	 *
+	 * @var int
+	 */
+	protected $configuredPid = 0;
+
+	/**
+	 * The page record of the configured pid
+	 *
+	 * @var array
+	 */
+	protected $page = null;
+
+	/**
+	 * A collection of speaking error messages why the pid is invalid.
+	 *
+	 * @var array
+	 */
+	protected $errors = [];
+
+	/**
+	 * Pseudo-Constructor, which ensures all dependencies are injected when called.
+	 */
+	public function initializeObject()
+	{
+		$this->dataType = $this->getModuleLoader()->getDataType();
+		$this->configuredPid = $this->getConfiguredPid();
+	}
+
+	/**
+	 * Renders warnings if storagePid is not properly configured.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$result = '';
+
+		$this->validateRootLevel();
+		$this->validatePageExist();
+		$this->validateDoktype();
+
+		if (!empty($this->errors)) {
+			$result .= $this->formatMessagePidIsNotValid();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Format a message whenever the storage is offline.
+	 *
+	 * @return string
+	 */
+	protected function formatMessagePidIsNotValid()
+	{
+
+		// TODO: after dropping typo3 7.6 support, remove class: typo3-message message-warning message-header message-body
+
+		$error = implode('<br />', $this->errors);
+		$result = <<< EOF
 			<div class="typo3-message message-warning alert alert-warning">
 				<div class="message-header alert-title">
 					Page id "{$this->configuredPid}" has found to be a wrong configuration for "{$this->dataType}"
@@ -116,129 +116,129 @@ 
 			</div>
 EOF;
 
-        return $result;
-    }
-
-    /**
-     * Check if pid is 0 and given table is allowed on root level.
-     *
-     * @return void
-     */
-    protected function validateRootLevel()
-    {
-        if ($this->configuredPid > 0) {
-            return;
-        }
-
-        $isRootLevel = (bool)Tca::table()->get('rootLevel');
-        if (!$isRootLevel) {
-            $this->errors[] = sprintf(
-                'You are not allowed to use page id "0" unless you set $GLOBALS[\'TCA\'][\'%1$s\'][\'ctrl\'][\'rootLevel\'] = 1;',
-                $this->dataType
-            );
-        }
-    }
-
-    /**
-     * Check if a page exists for the configured pid
-     *
-     * @return void
-     */
-    protected function validatePageExist()
-    {
-        if ($this->configuredPid === 0) {
-            return;
-        }
-
-        $page = $this->getPage();
-        if (empty($page)) {
-            $this->errors[] = sprintf(
-                'No page found for the configured page id "%s".',
-                $this->configuredPid
-            );
-        }
-    }
-
-    /**
-     * Check if configured page is a sysfolder and if it is allowed.
-     *
-     * @return void
-     */
-    protected function validateDoktype()
-    {
-        if ($this->configuredPid === 0) {
-            return;
-        }
-
-        $page = $this->getPage();
-        if (!empty($page) && $page['doktype'] != PageRepository::DOKTYPE_SYSFOLDER && !$this->isTableAllowedOnStandardPages()) {
-            $this->errors[] = sprintf(
-                'The page with the id "%s" either has to be of the type "folder" (doktype=254) or the table "%s" has to be allowed on standard pages.',
-                $this->configuredPid,
-                $this->dataType
-            );
-        }
-    }
-
-    /**
-     * Check if given table is allowed on standard pages
-     *
-     * @see \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages()
-     * @return bool
-     */
-    protected function isTableAllowedOnStandardPages()
-    {
-        $allowedTables = explode(',', $GLOBALS['PAGES_TYPES']['default']['allowedTables']);
-        $result = in_array($this->dataType, $allowedTables);
-
-        return $result;
-    }
-
-    /**
-     * Return the default configured pid.
-     *
-     * @return int
-     */
-    protected function getConfiguredPid()
-    {
-
-        if (GeneralUtility::_GP(Parameter::PID)) {
-            $pid = GeneralUtility::_GP(Parameter::PID);
-        } else {
-
-            // Get pid from User TSConfig if any.
-            $tsConfigPath = sprintf('tx_vidi.dataType.%s.storagePid', $this->dataType);
-            $result = $this->getBackendUser()->getTSConfig($tsConfigPath);
-            $configuredPid = (int)$result['value'];
-
-            // If no pid is configured, use default pid from Module Loader
-            $pid = ($configuredPid) ?: $this->getModuleLoader()->getDefaultPid();
-        }
-
-        return $pid;
-    }
-
-    /**
-     * Return a pointer to the database.
-     *
-     * @return \TYPO3\CMS\Core\Database\DatabaseConnection
-     */
-    protected function getDatabaseConnection()
-    {
-        return $GLOBALS['TYPO3_DB'];
-    }
-
-    /**
-     * Returns the page record of the configured pid
-     *
-     * @return array
-     */
-    public function getPage()
-    {
-        if ($this->page !== null) {
-            return $this->page;
-        } else {
-            return $this->getDatabaseConnection()->exec_SELECTgetSingleRow('doktype', 'pages', 'deleted = 0 AND uid = ' . $this->configuredPid);
-        }
-    }
+		return $result;
+	}
+
+	/**
+	 * Check if pid is 0 and given table is allowed on root level.
+	 *
+	 * @return void
+	 */
+	protected function validateRootLevel()
+	{
+		if ($this->configuredPid > 0) {
+			return;
+		}
+
+		$isRootLevel = (bool)Tca::table()->get('rootLevel');
+		if (!$isRootLevel) {
+			$this->errors[] = sprintf(
+				'You are not allowed to use page id "0" unless you set $GLOBALS[\'TCA\'][\'%1$s\'][\'ctrl\'][\'rootLevel\'] = 1;',
+				$this->dataType
+			);
+		}
+	}
+
+	/**
+	 * Check if a page exists for the configured pid
+	 *
+	 * @return void
+	 */
+	protected function validatePageExist()
+	{
+		if ($this->configuredPid === 0) {
+			return;
+		}
+
+		$page = $this->getPage();
+		if (empty($page)) {
+			$this->errors[] = sprintf(
+				'No page found for the configured page id "%s".',
+				$this->configuredPid
+			);
+		}
+	}
+
+	/**
+	 * Check if configured page is a sysfolder and if it is allowed.
+	 *
+	 * @return void
+	 */
+	protected function validateDoktype()
+	{
+		if ($this->configuredPid === 0) {
+			return;
+		}
+
+		$page = $this->getPage();
+		if (!empty($page) && $page['doktype'] != PageRepository::DOKTYPE_SYSFOLDER && !$this->isTableAllowedOnStandardPages()) {
+			$this->errors[] = sprintf(
+				'The page with the id "%s" either has to be of the type "folder" (doktype=254) or the table "%s" has to be allowed on standard pages.',
+				$this->configuredPid,
+				$this->dataType
+			);
+		}
+	}
+
+	/**
+	 * Check if given table is allowed on standard pages
+	 *
+	 * @see \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages()
+	 * @return bool
+	 */
+	protected function isTableAllowedOnStandardPages()
+	{
+		$allowedTables = explode(',', $GLOBALS['PAGES_TYPES']['default']['allowedTables']);
+		$result = in_array($this->dataType, $allowedTables);
+
+		return $result;
+	}
+
+	/**
+	 * Return the default configured pid.
+	 *
+	 * @return int
+	 */
+	protected function getConfiguredPid()
+	{
+
+		if (GeneralUtility::_GP(Parameter::PID)) {
+			$pid = GeneralUtility::_GP(Parameter::PID);
+		} else {
+
+			// Get pid from User TSConfig if any.
+			$tsConfigPath = sprintf('tx_vidi.dataType.%s.storagePid', $this->dataType);
+			$result = $this->getBackendUser()->getTSConfig($tsConfigPath);
+			$configuredPid = (int)$result['value'];
+
+			// If no pid is configured, use default pid from Module Loader
+			$pid = ($configuredPid) ?: $this->getModuleLoader()->getDefaultPid();
+		}
+
+		return $pid;
+	}
+
+	/**
+	 * Return a pointer to the database.
+	 *
+	 * @return \TYPO3\CMS\Core\Database\DatabaseConnection
+	 */
+	protected function getDatabaseConnection()
+	{
+		return $GLOBALS['TYPO3_DB'];
+	}
+
+	/**
+	 * Returns the page record of the configured pid
+	 *
+	 * @return array
+	 */
+	public function getPage()
+	{
+		if ($this->page !== null) {
+			return $this->page;
+		} else {
+			return $this->getDatabaseConnection()->exec_SELECTgetSingleRow('doktype', 'pages', 'deleted = 0 AND uid = ' . $this->configuredPid);
+		}
+	}
 }

Classes/View/Check/RelationsCheck.php

Indentation +84 added lines, -84 removed lines

@@ -17,40 +17,40 @@ 
 class RelationsCheck extends AbstractComponentView
 {
 
-    /**
-     * @var array
-     */
-    protected $invalidFields = [];
-
-    /**
-     * Renders a button for uploading assets.
-     *
-     * @return string
-     */
-    public function render()
-    {
-
-        $result = '';
-
-        // Check whether storage is configured or not.
-        if (!$this->isTcaValid()) {
-            $result .= $this->formatMessageTcaIsNotValid();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Format a message whenever the storage is offline.
-     *
-     * @return string
-     */
-    protected function formatMessageTcaIsNotValid()
-    {
-
-        // TODO: after dropping typo3 7.6 support, remove class: typo3-message message-warning message-header message-body
-
-        $result = <<< EOF
+	/**
+	 * @var array
+	 */
+	protected $invalidFields = [];
+
+	/**
+	 * Renders a button for uploading assets.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+
+		$result = '';
+
+		// Check whether storage is configured or not.
+		if (!$this->isTcaValid()) {
+			$result .= $this->formatMessageTcaIsNotValid();
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Format a message whenever the storage is offline.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageTcaIsNotValid()
+	{
+
+		// TODO: after dropping typo3 7.6 support, remove class: typo3-message message-warning message-header message-body
+
+		$result = <<< EOF
 			<div class="typo3-message message-warning alert alert-warning">
 				<div class="message-header alert-title">
 					Grid may have trouble to render because of wrong / missing TCA.
@@ -65,19 +65,19 @@ 
 				</div>
 			</div>
 EOF;
-        return $result;
-    }
-
-    /**
-     * Check relations of current data type in the Grid.
-     *
-     * @return string
-     */
-    protected function formatMessageHelperText()
-    {
-        $helperText = '';
-        foreach ($this->invalidFields as $invalidField) {
-            $helperText .= <<<EOF
+		return $result;
+	}
+
+	/**
+	 * Check relations of current data type in the Grid.
+	 *
+	 * @return string
+	 */
+	protected function formatMessageHelperText()
+	{
+		$helperText = '';
+		foreach ($this->invalidFields as $invalidField) {
+			$helperText .= <<<EOF
 				<br />
 				In file EXT:my_ext/Configuration/TCA/{$this->getModuleLoader()->getDataType()}.php
 <pre>
@@ -111,42 +111,42 @@ 
 
 </pre>
 EOF;
-        }
-        return $helperText;
-    }
-
-    /**
-     * Check relations of current data type in the Grid.
-     *
-     * @return boolean
-     */
-    protected function isTcaValid()
-    {
-
-        $dataType = $this->getModuleLoader()->getDataType();
-        $table = Tca::table($dataType);
-
-        foreach (Tca::grid($dataType)->getFields() as $fieldName => $configuration) {
-
-            if ($table->hasField($fieldName) && $table->field($fieldName)->hasMany()) {
-                if ($table->field($fieldName)->hasRelationManyToMany()) {
-
-                    $foreignTable = $table->field($fieldName)->getForeignTable();
-                    $manyToManyTable = $table->field($fieldName)->getManyToManyTable();
-                    $foreignField = $table->field($fieldName)->getForeignField();
-
-                    if (!$foreignField) {
-                        $this->invalidFields[] = $fieldName;
-                    } elseif (!$foreignTable) {
-                        $this->invalidFields[] = $fieldName;
-                    } elseif (!$manyToManyTable) {
-                        $this->invalidFields[] = $fieldName;
-                    }
-                }
-            }
-        }
-
-        return empty($this->invalidFields);
-    }
+		}
+		return $helperText;
+	}
+
+	/**
+	 * Check relations of current data type in the Grid.
+	 *
+	 * @return boolean
+	 */
+	protected function isTcaValid()
+	{
+
+		$dataType = $this->getModuleLoader()->getDataType();
+		$table = Tca::table($dataType);
+
+		foreach (Tca::grid($dataType)->getFields() as $fieldName => $configuration) {
+
+			if ($table->hasField($fieldName) && $table->field($fieldName)->hasMany()) {
+				if ($table->field($fieldName)->hasRelationManyToMany()) {
+
+					$foreignTable = $table->field($fieldName)->getForeignTable();
+					$manyToManyTable = $table->field($fieldName)->getManyToManyTable();
+					$foreignField = $table->field($fieldName)->getForeignField();
+
+					if (!$foreignField) {
+						$this->invalidFields[] = $fieldName;
+					} elseif (!$foreignTable) {
+						$this->invalidFields[] = $fieldName;
+					} elseif (!$manyToManyTable) {
+						$this->invalidFields[] = $fieldName;
+					}
+				}
+			}
+		}
+
+		return empty($this->invalidFields);
+	}
 
 }