Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-11-23 12:16:12 +01:00
Code Releases Activity

[BUGFIX] Inherit access groups from parent pages when extended to subpages

Browse source
This commit is contained in:
Benjamin Serfhos 2018-10-24 10:09:22 +02:00
parent 3f5273f0fe
commit 519bc7e5b4
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Classes/Domain/Index/TcaIndexer/PagesIndexer.php
View file

@ -25,6 +25,8 @@ use Codappix\SearchCore\Configuration\ConfigurationContainerInterface;
use Codappix\SearchCore\Connection\ConnectionInterface;
use Codappix\SearchCore\Domain\Index\TcaIndexer;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\RootlineUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
/**
* Specific indexer for Pages, will basically add content of page.
@ -65,6 +67,9 @@ class PagesIndexer extends TcaIndexer
{
parent::prepareRecord($record);
// Override access from parent rootline
$record['search_access'] = $this->fetchAccess($record['uid'], $record['search_access']);
$possibleTitleFields = ['nav_title', 'tx_tqseo_pagetitle_rel', 'title'];
foreach ($possibleTitleFields as $searchTitleField) {
if (isset($record[$searchTitleField]) && trim($record[$searchTitleField])) {
@ -148,6 +153,47 @@ class PagesIndexer extends TcaIndexer
return $this->fetchSysFileReferenceUids($uid, 'pages', 'media');
}
/**
* @param integer $uid
* @param array $pageAccess
* @return array
*/
protected function fetchAccess(int $uid, array $pageAccess): array
{
try {
$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
$rootline = $objectManager->get(RootlineUtility::class, $uid)->get();
} catch (\RuntimeException $e) {
$this->logger->notice(
sprintf('Could not fetch rootline for page %u, because: %s', $uid, $e->getMessage()),
[$pageAccess, $e]
);
return $pageAccess;
}
$access = [$pageAccess];
$extended = false;
foreach ($rootline as $pageInRootLine) {
if ($pageInRootLine['extendToSubpages'] && (!empty($pageInRootLine['fe_group']))) {
$extended = true;
$access[] = GeneralUtility::intExplode(
',',
$pageInRootLine['fe_group'],
true
);
}
}
// Return combined rootline extended access and return unique id's
$access = array_unique(array_merge(...$access));
// Remove public value if fe_group is extended to this page
if ($extended && ($key = array_search(0, $access, true)) !== false) {
unset($access[$key]);
}
return array_values($access);
}
/**
* @param integer $uid
* @param string $tablename

3
Classes/Domain/Index/TcaIndexer/TcaTableService.php
View file

@ -171,7 +171,8 @@ class TcaTableService implements TcaTableServiceInterface
if (isset($record[$this->tca['ctrl']['label']]) && !isset($record['search_title'])) {
$record['search_title'] = $record[$this->tca['ctrl']['label']];
}
if (isset($this->tca['ctrl']['enablecolumns']['fe_group']) && isset($record[$this->tca['ctrl']['enablecolumns']['fe_group']])) {
if (isset($this->tca['ctrl']['enablecolumns']['fe_group'], $record[$this->tca['ctrl']['enablecolumns']['fe_group']])) {
$groups = GeneralUtility::intExplode(
',',
$record[$this->tca['ctrl']['enablecolumns']['fe_group']],