[TASK] Fix RSS feed link creation

TYPO3GmbH · Feb 14, 2019 · 026ec8e · 026ec8e
1 parent 3ddd82e
commit 026ec8e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 9 deletions.
diff --git a/Classes/Controller/PostController.php b/Classes/Controller/PostController.php
@@ -95,13 +95,12 @@ public function injectBlogCacheService(CacheService $cacheService): void
 
     /**
      * @param ViewInterface $view
-     * @throws \TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException
      */
     protected function initializeView(ViewInterface $view): void
     {
         parent::initializeView($view);
-        if ($this->request->hasArgument('format') && $this->request->getArgument('format') === 'rss') {
-            $action = '.' . $this->request->getArgument('action');
+        if ($this->request->getFormat() === 'rss') {
+            $action = '.' . $this->request->getControllerActionName();
             $arguments = [];
             switch ($action) {
                 case '.listPostsByCategory':
@@ -120,6 +119,11 @@ protected function initializeView(ViewInterface $view): void
                         $arguments[] = $this->arguments['tag']->getValue()->getTitle();
                     }
                     break;
+                case '.listPostsByAuthor':
+                    if (isset($this->arguments['author'])) {
+                        $arguments[] = $this->arguments['author']->getValue()->getName();
+                    }
+                    break;
                 default:
             }
             $feedData = [

diff --git a/Classes/ViewHelpers/Link/ArchiveViewHelper.php b/Classes/ViewHelpers/Link/ArchiveViewHelper.php
@@ -59,7 +59,6 @@ public function render(): string
             ->setUseCacheHash(true);
         if ($rssFormat) {
             $uriBuilder
-                ->setFormat('rss')
                 ->setTargetPageType($this->getTypoScriptFrontendController()->tmpl->setup['blog_rss_archive.']['typeNum']);
         }
         $uri = $uriBuilder->uriFor('listPostsByDate', $arguments, 'Post', 'Blog', 'Archive');

diff --git a/Classes/ViewHelpers/Link/AuthorViewHelper.php b/Classes/ViewHelpers/Link/AuthorViewHelper.php
@@ -96,7 +96,6 @@ protected function getUriBuilder(int $pageUid, array $additionalParams, bool $rs
             ->setArguments($additionalParams);
         if ($rssFormat) {
             $uriBuilder
-                ->setFormat('rss')
                 ->setTargetPageType($this->getTypoScriptFrontendController()->tmpl->setup['blog_rss_author.']['typeNum']);
         }
 

diff --git a/Classes/ViewHelpers/Link/CategoryViewHelper.php b/Classes/ViewHelpers/Link/CategoryViewHelper.php
@@ -56,7 +56,6 @@ public function render(): string
             ->setUseCacheHash(true);
         if ($rssFormat) {
             $uriBuilder
-                ->setFormat('rss')
                 ->setTargetPageType($this->getTypoScriptFrontendController()->tmpl->setup['blog_rss_category.']['typeNum']);
         }
         $uri = $uriBuilder->uriFor('listPostsByCategory', $arguments, 'Post', 'Blog', 'Category');

diff --git a/Classes/ViewHelpers/Link/TagViewHelper.php b/Classes/ViewHelpers/Link/TagViewHelper.php
@@ -56,7 +56,6 @@ public function render(): string
             ->setUseCacheHash(true);
         if ($rssFormat) {
             $uriBuilder
-                ->setFormat('rss')
                 ->setTargetPageType($this->getTypoScriptFrontendController()->tmpl->setup['blog_rss_tag.']['typeNum']);
         }
         $uri = $uriBuilder->uriFor('listPostsByTag', $arguments, 'Post', 'Blog', 'Tag');

diff --git a/Configuration/TypoScript/Static/setup.typoscript b/Configuration/TypoScript/Static/setup.typoscript
@@ -145,6 +145,7 @@ blog_rss_posts = PAGE
 blog_rss_posts {
     typeNum = 200
     10 < tt_content.list.20.blog_posts
+    10.format = rss
 
     config {
         disableAllHeaderCode = 1
@@ -161,14 +162,17 @@ blog_rss_posts {
 blog_rss_category < blog_rss_posts
 blog_rss_category.typeNum = 210
 blog_rss_category.10 < tt_content.list.20.blog_category
+blog_rss_category.10.format = rss
 
 blog_rss_tag < blog_rss_posts
 blog_rss_tag.typeNum = 220
 blog_rss_tag.10 < tt_content.list.20.blog_tag
+blog_rss_tag.10.format = rss
 
 blog_rss_archive < blog_rss_posts
 blog_rss_archive.typeNum = 230
 blog_rss_archive.10 < tt_content.list.20.blog_archive
+blog_rss_archive.10.format = rss
 
 blog_rss_comments < blog_rss_posts
 blog_rss_comments.typeNum = 240
@@ -177,3 +181,4 @@ blog_rss_comments.10 < tt_content.list.20.blog_comments
 blog_rss_author < blog_rss_posts
 blog_rss_author.typeNum = 250
 blog_rss_author.10 < tt_content.list.20.blog_authorposts
+blog_rss_author.10.format = rss
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
@@ -375,6 +375,12 @@
 			<trans-unit id="feed.description.listPostsByCategory" xml:space="preserve">
 				<source>Posts by category %s</source>
 			</trans-unit>
+			<trans-unit id="feed.title.listPostsByAuthor" xml:space="preserve">
+				<source>Author RSS Feed</source>
+			</trans-unit>
+			<trans-unit id="feed.description.listPostsByAuthor" xml:space="preserve">
+				<source>Posts by author %s</source>
+			</trans-unit>
 			<trans-unit id="feed.title.listPostsByDate" xml:space="preserve">
 				<source>Archive RSS Feed</source>
 			</trans-unit>

diff --git a/Resources/Private/Templates/Widget/Feed.html b/Resources/Private/Templates/Widget/Feed.html
@@ -4,6 +4,6 @@
 <f:section name="content">
     <h3 class="widget-title"><f:translate key="headline.rssfeed"/></h3>
     <ul class="feeds">
-        <li><f:link.action pageUid="{settings.blogUid}" pageType="200" format="rss" action="listRecentPosts" controller="Post">Recent posts</f:link.action></li>
+        <li><f:link.page pageUid="{settings.blogUid}" pageType="200">Recent posts</f:link.page></li>
     </ul>
-</f:section>
+</f:section>