From d01543286e4c0d139b86518c3435faa558637b33 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Sat, 10 Jul 2021 21:47:06 +0200 Subject: Remove pages from the RSS feed (readme) This commit removes the pages from the RSS feed. I decided so because a page is a "timeless" object intended for things like the imprint, about page, privacy policy and similar stuff. It also makes things easier. The new primary feed URL is "/feed/" and shows only posts. The page feed ("/feed/page/") has been removed and will throw a 404 Not Found error. The visitors who already subscribed to the old post feed ("/feed/post/") are automatically 301-redirected to the new location ("/feed/"). The following system language variables have been removed: * feed_name_items * feed_name_pages * feed_name_posts The following configuration options have been removed: * PAGE.FEED_SIZE * PAGE.FEED_SORT * PAGE.FEED_GUID Furthermore, the template file "feed/item_post.php" has been renamed to "feed/item.php" since there is now only one type of feed item. If the system cannot find the "feed/item.php", it tries "feed/item_post.php" instead (for backward compatibility with older themes). --- core/include/feed/main.php | 64 +++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 40 deletions(-) (limited to 'core/include/feed') diff --git a/core/include/feed/main.php b/core/include/feed/main.php index 637c54b..cbabb2c 100644 --- a/core/include/feed/main.php +++ b/core/include/feed/main.php @@ -1,56 +1,40 @@ getPaginated( + Application::get('POST.FEED_SORT'), + Application::get('POST.FEED_SIZE') +); #=============================================================================== -# Post feed +# Build item templates #=============================================================================== -if(!isset($param) OR $param !== 'page') { - $PostRepository = Application::getRepository('Post'); - - $posts = $PostRepository->getPaginated( - Application::get('POST.FEED_SORT'), - Application::get('POST.FEED_SIZE') - ); - - foreach($posts as $Post) { - $User = $UserRepository->find($Post->get('user')); +foreach($posts as $Post) { + $User = $UserRepository->find($Post->get('user')); + try { + $ItemTemplate = Template\Factory::build('feed/item'); + } catch(Template\Exception $Exception) { + # Backward compatibility if feed/item.php does not exist. $ItemTemplate = Template\Factory::build('feed/item_post'); - $ItemTemplate->set('POST', generateItemTemplateData($Post)); - $ItemTemplate->set('USER', generateItemTemplateData($User)); - - $post_templates[] = $ItemTemplate; } -} - -#=============================================================================== -# Page feed -#=============================================================================== -if(!isset($param) OR $param !== 'post') { - $PageRepository = Application::getRepository('Page'); - - $pages = $PageRepository->getPaginated( - Application::get('PAGE.FEED_SORT'), - Application::get('PAGE.FEED_SIZE') - ); - foreach($pages as $Page) { - $User = $UserRepository->find($Page->get('user')); + $ItemTemplate->set('POST', generateItemTemplateData($Post)); + $ItemTemplate->set('USER', generateItemTemplateData($User)); - $ItemTemplate = Template\Factory::build('feed/item_page'); - $ItemTemplate->set('PAGE', generateItemTemplateData($Page)); - $ItemTemplate->set('USER', generateItemTemplateData($User)); - - $page_templates[] = $ItemTemplate; - } + $templates[] = $ItemTemplate; } #=============================================================================== @@ -58,10 +42,10 @@ if(!isset($param) OR $param !== 'post') { #=============================================================================== $FeedTemplate = Template\Factory::build('feed/main'); $FeedTemplate->set('FEED', [ - 'TYPE' => $param ?? NULL, + 'TYPE' => 'post', 'LIST' => [ - 'POSTS' => $post_templates ?? [], - 'PAGES' => $page_templates ?? [], + 'POSTS' => $templates ?? [], + 'PAGES' => [], ] ]); -- cgit v1.2.3