Skip to content
This repository has been archived by the owner on Dec 4, 2018. It is now read-only.

Commit

Permalink
[TASK] Refactor WizardItemsHookSubscriber to use shared base
Browse files Browse the repository at this point in the history 
As per FluidTYPO3/flux@043b4db, implement usage of new shared functions for wizard items hook subscriber.
  • Loading branch information
@NamelessCoder
NamelessCoder committed Feb 5, 2015
1 parent c92c2c3 commit 7301ebe
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 188 deletions.
168 changes: 8 additions & 160 deletions Classes/Hooks/WizardItemsHookSubscriber.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

use FluidTYPO3\Fluidcontent\Service\ConfigurationService;
use FluidTYPO3\Flux\Form\FormInterface;
use FluidTYPO3\Flux\Hooks\WizardItemsHookSubscriber as FluxWizardItemsHookSubscriber;
use FluidTYPO3\Flux\Service\WorkspacesAwareRecordService;
use TYPO3\CMS\Backend\Controller\ContentElement\NewContentElementController;
use TYPO3\CMS\Backend\Wizard\NewContentElementWizardHookInterface;
Expand All @@ -19,57 +20,20 @@
/**
* WizardItems Hook Subscriber
*/
class WizardItemsHookSubscriber implements NewContentElementWizardHookInterface {
class WizardItemsHookSubscriber extends FluxWizardItemsHookSubscriber implements NewContentElementWizardHookInterface {

/**
* @var ConfigurationService
*/
protected $configurationService;

/**
* @var WorkspacesAwareRecordService
*/
protected $recordService;

/**
* @var ObjectManagerInterface
*/
protected $objectManager;

/**
* @param ConfigurationService $configurationService
* @return void
*/
public function injectConfigurationService(ConfigurationService $configurationService) {
$this->configurationService = $configurationService;
}

/**
* @param WorkspacesAwareRecordService $recordService
* @return void
*/
public function injectRecordService(WorkspacesAwareRecordService $recordService) {
$this->recordService = $recordService;
}

/**
* @param ObjectManagerInterface $objectManager
* @return void
*/
public function injectObjectManager(ObjectManagerInterface $objectManager) {
$this->objectManager = $objectManager;
}

/**
* Constructor
*/
public function __construct() {
$objectManager = GeneralUtility::makeInstance('TYPO3\CMS\Extbase\Object\ObjectManager');
$this->injectObjectManager($objectManager);
$configurationService = $this->objectManager->get('FluidTYPO3\Fluidcontent\Service\ConfigurationService');
parent::__construct();
$configurationService = $this->objectManager->get('FluidTYPO3\\Fluidcontent\\Service\\ConfigurationService');
$this->injectConfigurationService($configurationService);
$recordService = $this->objectManager->get('FluidTYPO3\Flux\Service\WorkspacesAwareRecordService');
$this->injectRecordService($recordService);
}

/**
Expand All @@ -82,42 +46,6 @@ public function manipulateWizardItems(&$items, &$parentObject) {
$items = $this->filterPermittedFluidContentTypesByInsertionPosition($items, $parentObject);
}

/**
* @param array $items
* @param NewContentElementController $parentObject
* @return array
*/
protected function filterPermittedFluidContentTypesByInsertionPosition(array $items, $parentObject) {
list ($whitelist, $blacklist) = $this->getWhiteAndBlackListsFromPageAndContentColumn(
$parentObject->id,
$parentObject->colPos,
$parentObject->uid_pid
);
$items = $this->applyWhitelist($items, $whitelist);
$items = $this->applyBlacklist($items, $blacklist);
$items = $this->cleanEmptySections($items);
return $items;
}

/**
* @param array $items
* @return array
*/
protected function cleanEmptySections(array $items) {
$preserveHeaders = array();
foreach ($items as $name => $item) {
if (FALSE !== strpos($name, '_')) {
array_push($preserveHeaders, reset(explode('_', $name)));
}
}
foreach ($items as $name => $item) {
if (FALSE === strpos($name, '_') && FALSE === in_array($name, $preserveHeaders)) {
unset($items[$name]);
}
}
return $items;
}

/**
* @param array $items
* @param array $whitelist
Expand All @@ -126,7 +54,8 @@ protected function cleanEmptySections(array $items) {
protected function applyWhitelist(array $items, array $whitelist) {
if (0 < count($whitelist)) {
foreach ($items as $name => $item) {
if (FALSE !== strpos($name, '_') && 'fluidcontent_content' === $item['tt_content_defValues']['CType'] && FALSE === in_array($item['tt_content_defValues']['tx_fed_fcefile'], $whitelist)) {
if (FALSE !== strpos($name, '_') && 'fluidcontent_content' === $item['tt_content_defValues']['CType']
&& FALSE === in_array($item['tt_content_defValues']['tx_fed_fcefile'], $whitelist)) {
unset($items[$name]);
}
}
Expand All @@ -143,7 +72,8 @@ protected function applyBlacklist(array $items, array $blacklist) {
if (0 < count($blacklist)) {
foreach ($blacklist as $contentElementType) {
foreach ($items as $name => $item) {
if ('fluidcontent_content' === $item['tt_content_defValues']['CType'] && $item['tt_content_defValues']['tx_fed_fcefile'] === $contentElementType) {
if ('fluidcontent_content' === $item['tt_content_defValues']['CType']
&& $item['tt_content_defValues']['tx_fed_fcefile'] === $contentElementType) {
unset($items[$name]);
}
}
Expand All @@ -152,88 +82,6 @@ protected function applyBlacklist(array $items, array $blacklist) {
return $items;
}

/**
* @param integer $pageUid
* @param integer $columnPosition
* @param integer $relativeUid
* @return array
*/
protected function getWhiteAndBlackListsFromPageAndContentColumn($pageUid, $columnPosition, $relativeUid) {
$whitelist = array();
$blacklist = array();
// if a Provider is registered for the "pages" table, try to get a Grid from it. If the Grid
// returned contains a Column which matches the desired colPos value, attempt to read a list
// of allowed/denied content element types from it.
$pageRecord = (array) $this->recordService->getSingle('pages', '*', $pageUid);
$pageProviders = $this->configurationService->resolveConfigurationProviders('pages', NULL, $pageRecord);
$this->appendToWhiteAndBlacklistFromProviders($pageProviders, $pageRecord, $whitelist, $blacklist, $columnPosition);
// Detect what was clicked in order to create the new content element; decide restrictions
// based on this.
$defaultValues = GeneralUtility::_GET('defVals');
if (0 > $relativeUid) {
// pasting after another element means we should try to resolve the Flux content relation
// from that element instead of GET parameters (clicked: "create new" icon after other element)
$parentRecord = $this->recordService->getSingle('tt_content', '*', abs($relativeUid));
$fluxAreaName = (string) $parentRecord['tx_flux_column'];
$parentRecordUid = (integer) $parentRecord['tx_flux_parent'];
} elseif (TRUE === isset($defaultValues['tt_content']['tx_flux_column'])) {
// attempt to read the target Flux content area from GET parameters (clicked: "create new" icon
// in top of nested Flux content area
$fluxAreaName = (string) $defaultValues['tt_content']['tx_flux_column'];
$parentRecordUid = (integer) $defaultValues['tt_content']['tx_flux_parent'];
}
// if these variables now indicate that we are inserting content elements into a Flux-enabled content
// area inside another content element, attempt to read allowed/denied content types from the
// Grid returned by the Provider that applies to the parent element's type and configuration
// (admitted, that's quite a mouthful - but it's not that different from reading the values from
// a page template like above; it's the same principle).
if (0 < $parentRecordUid && FALSE === empty($fluxAreaName)) {
$parentRecord = (array) $this->recordService->getSingle('tt_content', '*', $parentRecordUid);
$contentProviders = $this->configurationService->resolveConfigurationProviders('tt_content', NULL, $parentRecord);
$this->appendToWhiteAndBlacklistFromProviders($contentProviders, $parentRecord, $whitelist, $blacklist, NULL, $fluxAreaName);
}
// White/blacklist filtering. If whitelist contains elements, filter the list
// of possible types by whitelist first. Then apply the blacklist, removing
// any element types recorded herein.
$whitelist = array_unique($whitelist);
$blacklist = array_unique($blacklist);
return array($whitelist, $blacklist);
}

/**
* @param array $providers
* @param array $record
* @param integer $columnPosition
* @param string $fluxAreaName
*/
protected function appendToWhiteAndBlacklistFromProviders(
array $providers,
array $record,
array &$whitelist,
array &$blacklist,
$columnPosition,
$fluxAreaName = NULL
) {
foreach ($providers as $provider) {
$grid = $provider->getGrid($record);
if (NULL === $grid) {
continue;
}
foreach ($grid->getRows() as $row) {
foreach ($row->getColumns() as $column) {
if (FALSE === empty($fluxAreaName)) {
if ($column->getName() === $fluxAreaName) {
list ($whitelist, $blacklist) = $this->appendToWhiteAndBlacklistFromComponent($column, $whitelist, $blacklist);
}
} elseif ($column->getColumnPosition() === $columnPosition) {
list ($whitelist, $blacklist) = $this->appendToWhiteAndBlacklistFromComponent($column, $whitelist, $blacklist);
}
}
}
}

}

/**
* @param FormInterface $component
* @param array $whitelist
Expand Down
55 changes: 27 additions & 28 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7301ebe

Please sign in to comment.