Skip to content
Snippets Groups Projects
Commit 668923c4 authored by Kevin Ditscheid's avatar Kevin Ditscheid
Browse files

[BUGFIX] Remove unused function call

parent 349ed88a
No related branches found
No related tags found
2 merge requests!13Feature remove sg news ajax plugin,!8Feature upgrade to9 lts
...@@ -100,6 +100,7 @@ class BackendNewsUtility { ...@@ -100,6 +100,7 @@ class BackendNewsUtility {
if ($pageInfo) { if ($pageInfo) {
$options[] = self::getOptionPageInfo($pageInfo); $options[] = self::getOptionPageInfo($pageInfo);
} }
$categories = self::getCategoriesForSiteRoot((int) $row['uid']); $categories = self::getCategoriesForSiteRoot((int) $row['uid']);
/** @var int $categoryUid */ /** @var int $categoryUid */
foreach ($categories as $categoryUid => $categoryTitle) { foreach ($categories as $categoryUid => $categoryTitle) {
...@@ -114,6 +115,7 @@ class BackendNewsUtility { ...@@ -114,6 +115,7 @@ class BackendNewsUtility {
} }
} }
} }
return $options; return $options;
} }
...@@ -131,10 +133,12 @@ class BackendNewsUtility { ...@@ -131,10 +133,12 @@ class BackendNewsUtility {
foreach ($rootline as $page) { foreach ($rootline as $page) {
$path .= '/p' . dechex($page['uid']); $path .= '/p' . dechex($page['uid']);
} }
$pageInfo['path'] = $path; $pageInfo['path'] = $path;
$pageInfo['_thePathFull'] = substr($pageInfo['_thePathFull'], 1); $pageInfo['_thePathFull'] = substr($pageInfo['_thePathFull'], 1);
$pageInfo['_thePathFull'] = substr($pageInfo['_thePathFull'], 0, -1); $pageInfo['_thePathFull'] = substr($pageInfo['_thePathFull'], 0, -1);
} }
return $pageInfo; return $pageInfo;
} }
...@@ -193,6 +197,7 @@ class BackendNewsUtility { ...@@ -193,6 +197,7 @@ class BackendNewsUtility {
$GLOBALS['TSFE'] = new \stdClass(); $GLOBALS['TSFE'] = new \stdClass();
$GLOBALS['TSFE']->gr_list = ''; $GLOBALS['TSFE']->gr_list = '';
} }
$pageUid = (int) $pageUid; $pageUid = (int) $pageUid;
$languageUid = (int) $languageUid; $languageUid = (int) $languageUid;
$tags = []; $tags = [];
...@@ -212,18 +217,22 @@ class BackendNewsUtility { ...@@ -212,18 +217,22 @@ class BackendNewsUtility {
if (isset($pageTS['TCEFORM.']['pages.']['tx_sgnews_tags.']['PAGE_TSCONFIG_ID'])) { if (isset($pageTS['TCEFORM.']['pages.']['tx_sgnews_tags.']['PAGE_TSCONFIG_ID'])) {
$tagsPid = (int) $pageTS['TCEFORM.']['pages.']['tx_sgnews_tags.']['PAGE_TSCONFIG_ID']; $tagsPid = (int) $pageTS['TCEFORM.']['pages.']['tx_sgnews_tags.']['PAGE_TSCONFIG_ID'];
} }
if ($tagsPid) { if ($tagsPid) {
$query->matching($query->equals('pid', $tagsPid)); $query->matching($query->equals('pid', $tagsPid));
} }
} }
$query->setOrderings(['title' => QueryInterface::ORDER_ASCENDING]); $query->setOrderings(['title' => QueryInterface::ORDER_ASCENDING]);
$resultTags = $query->execute(TRUE); $resultTags = $query->execute(TRUE);
if ($temporaryTSFEInstance) { if ($temporaryTSFEInstance) {
unset($GLOBALS['TSFE']); unset($GLOBALS['TSFE']);
} }
foreach ($resultTags as $tag) { foreach ($resultTags as $tag) {
$tags[(int) $tag['uid']] = trim($tag['title']); $tags[(int) $tag['uid']] = trim($tag['title']);
} }
return $tags; return $tags;
} }
...@@ -243,6 +252,7 @@ class BackendNewsUtility { ...@@ -243,6 +252,7 @@ class BackendNewsUtility {
$GLOBALS['TSFE'] = new \stdClass(); $GLOBALS['TSFE'] = new \stdClass();
$GLOBALS['TSFE']->gr_list = ''; $GLOBALS['TSFE']->gr_list = '';
} }
$newsItemUid = (int) $newsItemUid; $newsItemUid = (int) $newsItemUid;
$languageUid = (int) $languageUid; $languageUid = (int) $languageUid;
$tags = []; $tags = [];
...@@ -257,17 +267,20 @@ class BackendNewsUtility { ...@@ -257,17 +267,20 @@ class BackendNewsUtility {
if ($newsItemUid) { if ($newsItemUid) {
$query->matching($query->equals('uid', $newsItemUid)); $query->matching($query->equals('uid', $newsItemUid));
} }
/** @var News $newsItem */ /** @var News $newsItem */
$newsItem = $query->execute()->getFirst(); $newsItem = $query->execute()->getFirst();
if ($temporaryTSFEInstance) { if ($temporaryTSFEInstance) {
unset($GLOBALS['TSFE']); unset($GLOBALS['TSFE']);
} }
if ($newsItem) { if ($newsItem) {
/** @var Tag $tag */ /** @var Tag $tag */
foreach ($newsItem->getTags() as $tag) { foreach ($newsItem->getTags() as $tag) {
$tags[(int) $tag->getUid()] = trim($tag->getTitle()); $tags[(int) $tag->getUid()] = trim($tag->getTitle());
} }
} }
return $tags; return $tags;
} }
...@@ -287,6 +300,7 @@ class BackendNewsUtility { ...@@ -287,6 +300,7 @@ class BackendNewsUtility {
if (!$rootPageUid) { if (!$rootPageUid) {
return $out; return $out;
} }
$categories = []; $categories = [];
if (!isset($filters['categories']) || !is_array($filters['categories']) || !count($filters['categories'])) { if (!isset($filters['categories']) || !is_array($filters['categories']) || !count($filters['categories'])) {
$rootCategories = self::getCategoriesForSiteRoot($rootPageUid); $rootCategories = self::getCategoriesForSiteRoot($rootPageUid);
...@@ -305,9 +319,11 @@ class BackendNewsUtility { ...@@ -305,9 +319,11 @@ class BackendNewsUtility {
} }
} }
} }
if (!count($categories)) { if (!count($categories)) {
return $out; return $out;
} }
$queryGenerator = GeneralUtility::makeInstance(QueryGenerator::class); $queryGenerator = GeneralUtility::makeInstance(QueryGenerator::class);
$allowedUids = []; $allowedUids = [];
foreach ($categories as $categoryUid) { foreach ($categories as $categoryUid) {
...@@ -318,12 +334,8 @@ class BackendNewsUtility { ...@@ -318,12 +334,8 @@ class BackendNewsUtility {
); );
$allowedUids = array_unique(array_merge($allowedUids, $allowedUidsTemp)); $allowedUids = array_unique(array_merge($allowedUids, $allowedUidsTemp));
} }
if (!count($allowedUids)) {
return $out;
}
list($select, $tables, $where) = self::getNewsQueryParts($allowedUids, $filters, $languageUid); if (!count($allowedUids)) {
if ($tables === '') {
return $out; return $out;
} }
...@@ -361,6 +373,7 @@ class BackendNewsUtility { ...@@ -361,6 +373,7 @@ class BackendNewsUtility {
); );
} }
} }
if (isset($filters['tags']) && is_array($filters['tags']) && count($filters['tags'])) { if (isset($filters['tags']) && is_array($filters['tags']) && count($filters['tags'])) {
$queryBuilder->innerJoin('p', 'sys_category_record_mm', 'tag', $queryBuilder->innerJoin('p', 'sys_category_record_mm', 'tag',
$queryBuilder->expr()->andX( $queryBuilder->expr()->andX(
...@@ -385,6 +398,7 @@ class BackendNewsUtility { ...@@ -385,6 +398,7 @@ class BackendNewsUtility {
$expressions[] = $queryBuilder->expr()->like('translation.author', $queryBuilder->createNamedParameter('%' . trim($filters['search']) . '%')); $expressions[] = $queryBuilder->expr()->like('translation.author', $queryBuilder->createNamedParameter('%' . trim($filters['search']) . '%'));
$expressions[] = $queryBuilder->expr()->like('translation.abstract', $queryBuilder->createNamedParameter('%' . trim($filters['search']) . '%')); $expressions[] = $queryBuilder->expr()->like('translation.abstract', $queryBuilder->createNamedParameter('%' . trim($filters['search']) . '%'));
} }
$queryBuilder->andWhere( $queryBuilder->andWhere(
$queryBuilder->expr()->orX( $queryBuilder->expr()->orX(
$expressions $expressions
...@@ -410,10 +424,12 @@ class BackendNewsUtility { ...@@ -410,10 +424,12 @@ class BackendNewsUtility {
if (isset($pageTS['mod.']['SHARED.']['defaultLanguageLabel'])) { if (isset($pageTS['mod.']['SHARED.']['defaultLanguageLabel'])) {
$defaultLanguage = $pageTS['mod.']['SHARED.']['defaultLanguageLabel'] . ' (' . $defaultLanguage . ')'; $defaultLanguage = $pageTS['mod.']['SHARED.']['defaultLanguageLabel'] . ' (' . $defaultLanguage . ')';
} }
$defaultLanguageFlag = 'empty-empty'; $defaultLanguageFlag = 'empty-empty';
if (isset($pageTS['mod.']['SHARED.']['defaultLanguageFlag'])) { if (isset($pageTS['mod.']['SHARED.']['defaultLanguageFlag'])) {
$defaultLanguageFlag = 'flags-' . $pageTS['mod.']['SHARED.']['defaultLanguageFlag']; $defaultLanguageFlag = 'flags-' . $pageTS['mod.']['SHARED.']['defaultLanguageFlag'];
} }
$languages = [ $languages = [
0 => ['title' => $defaultLanguage, 'flag' => $defaultLanguageFlag] 0 => ['title' => $defaultLanguage, 'flag' => $defaultLanguageFlag]
]; ];
...@@ -434,6 +450,7 @@ class BackendNewsUtility { ...@@ -434,6 +450,7 @@ class BackendNewsUtility {
} }
} }
} }
return $languages; return $languages;
} }
...@@ -500,6 +517,7 @@ class BackendNewsUtility { ...@@ -500,6 +517,7 @@ class BackendNewsUtility {
return $queryBuilder->execute()->fetchAll(); return $queryBuilder->execute()->fetchAll();
} }
return NULL; return NULL;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment