From d01543286e4c0d139b86518c3435faa558637b33 Mon Sep 17 00:00:00 2001
From: Thomas Lange <code@nerdmind.de>
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).
---
 theme/default/html/feed/item.php      | 27 +++++++++++++++++++++++++++
 theme/default/html/feed/item_page.php | 27 ---------------------------
 theme/default/html/feed/item_post.php | 27 ---------------------------
 theme/default/html/feed/main.php      | 32 +++++++-------------------------
 theme/default/html/home.php           |  3 +--
 theme/default/html/main.php           |  5 +----
 theme/default/html/page/list.php      |  2 +-
 theme/default/html/post/list.php      |  2 +-
 theme/default/lang/de.php             |  5 +++++
 theme/default/lang/en.php             |  5 +++++
 10 files changed, 48 insertions(+), 87 deletions(-)
 create mode 100644 theme/default/html/feed/item.php
 delete mode 100644 theme/default/html/feed/item_page.php
 delete mode 100644 theme/default/html/feed/item_post.php

(limited to 'theme/default')

diff --git a/theme/default/html/feed/item.php b/theme/default/html/feed/item.php
new file mode 100644
index 0000000..0bf23fc
--- /dev/null
+++ b/theme/default/html/feed/item.php
@@ -0,0 +1,27 @@
+<?php
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
+# Feed Item Template [post]                  [Thomas Lange <code@nerdmind.de>] #
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
+#                                                                              #
+# [see documentation]                                                          #
+#                                                                              #
+#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
+
+$HTML = $POST['BODY']['HTML']();
+?>
+<item>
+	<title><?=escapeHTML($POST['ATTR']['NAME'])?></title>
+	<link><?=$POST['URL']?></link>
+	<guid isPermaLink="false"><?=$POST['GUID']?></guid>
+	<pubDate><?=parseDatetime($POST['ATTR']['TIME_INSERT'], '[RFC2822]')?></pubDate>
+	<dc:creator><?=escapeHTML($USER['ATTR']['FULLNAME'])?></dc:creator>
+	<description><?=escapeHTML(description($HTML, 400))?></description>
+	<content:encoded>
+		<![CDATA[
+			<?=$HTML?>
+		]]>
+	</content:encoded>
+	<?php foreach($POST['FILE']['LIST'] as $fileURL): ?>
+		<media:content url="<?=$fileURL?>" medium="image"></media:content>
+	<?php endforeach; ?>
+</item>
diff --git a/theme/default/html/feed/item_page.php b/theme/default/html/feed/item_page.php
deleted file mode 100644
index 82568a1..0000000
--- a/theme/default/html/feed/item_page.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
-# Feed Item Template [page]                  [Thomas Lange <code@nerdmind.de>] #
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
-#                                                                              #
-# [see documentation]                                                          #
-#                                                                              #
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
-
-$HTML = $PAGE['BODY']['HTML']();
-?>
-<item>
-	<title><?=escapeHTML($PAGE['ATTR']['NAME'])?></title>
-	<link><?=$PAGE['URL']?></link>
-	<guid isPermaLink="false"><?=$PAGE['GUID']?></guid>
-	<pubDate><?=parseDatetime($PAGE['ATTR']['TIME_INSERT'], '[RFC2822]')?></pubDate>
-	<dc:creator><?=escapeHTML($USER['ATTR']['FULLNAME'])?></dc:creator>
-	<description><?=escapeHTML(description($HTML, 400))?></description>
-	<content:encoded>
-		<![CDATA[
-			<?=$HTML?>
-		]]>
-	</content:encoded>
-	<?php foreach($PAGE['FILE']['LIST'] as $fileURL): ?>
-		<media:content url="<?=$fileURL?>" medium="image"></media:content>
-	<?php endforeach; ?>
-</item>
diff --git a/theme/default/html/feed/item_post.php b/theme/default/html/feed/item_post.php
deleted file mode 100644
index 0bf23fc..0000000
--- a/theme/default/html/feed/item_post.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
-# Feed Item Template [post]                  [Thomas Lange <code@nerdmind.de>] #
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
-#                                                                              #
-# [see documentation]                                                          #
-#                                                                              #
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
-
-$HTML = $POST['BODY']['HTML']();
-?>
-<item>
-	<title><?=escapeHTML($POST['ATTR']['NAME'])?></title>
-	<link><?=$POST['URL']?></link>
-	<guid isPermaLink="false"><?=$POST['GUID']?></guid>
-	<pubDate><?=parseDatetime($POST['ATTR']['TIME_INSERT'], '[RFC2822]')?></pubDate>
-	<dc:creator><?=escapeHTML($USER['ATTR']['FULLNAME'])?></dc:creator>
-	<description><?=escapeHTML(description($HTML, 400))?></description>
-	<content:encoded>
-		<![CDATA[
-			<?=$HTML?>
-		]]>
-	</content:encoded>
-	<?php foreach($POST['FILE']['LIST'] as $fileURL): ?>
-		<media:content url="<?=$fileURL?>" medium="image"></media:content>
-	<?php endforeach; ?>
-</item>
diff --git a/theme/default/html/feed/main.php b/theme/default/html/feed/main.php
index 317bd31..bdd0a48 100644
--- a/theme/default/html/feed/main.php
+++ b/theme/default/html/feed/main.php
@@ -7,24 +7,12 @@
 #                                                                              #
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
 
-$BLOGMETA_NAME = escapeHTML($BLOGMETA['NAME']);
-
-switch($FEED['TYPE']) {
-	case 'post':
-		$title = $Language->text('feed_name_posts', $BLOGMETA_NAME);
-		$self = Application::getURL('feed/post/');
-		break;
-	case 'page':
-		$title = $Language->text('feed_name_pages', $BLOGMETA_NAME);
-		$self = Application::getURL('feed/page/');
-		break;
-	default:
-		$title = $Language->text('feed_name_items', $BLOGMETA_NAME);
-		$self = Application::getURL('feed/');
-}
+$title = escapeHTML($BLOGMETA['NAME']);
+$self = Application::getURL('feed/');
 ?>
 <?='<?xml version="1.0" encoding="UTF-8" ?>'?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:media="http://search.yahoo.com/mrss/">
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"
+     xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:media="http://search.yahoo.com/mrss/">
 	<channel>
 		<title><?=$title?></title>
 		<link><?=Application::getURL()?></link>
@@ -39,14 +27,8 @@ switch($FEED['TYPE']) {
 			<link><?=Application::getURL()?></link>
 		</image>
 
-		<!-- Feed items of type "post" -->
-		<?php foreach($FEED['LIST']['POSTS'] as $item): ?>
-			<?php echo $item ?>
-		<?php endforeach; ?>
-
-		<!-- Feed items of type "page" -->
-		<?php foreach($FEED['LIST']['PAGES'] as $item): ?>
-			<?php echo $item ?>
-		<?php endforeach; ?>
+		<?php foreach($FEED['LIST']['POSTS'] as $post): ?>
+			<?php echo $post ?>
+		<?php endforeach ?>
 	</channel>
 </rss>
diff --git a/theme/default/html/home.php b/theme/default/html/home.php
index b412f22..22406e8 100644
--- a/theme/default/html/home.php
+++ b/theme/default/html/home.php
@@ -7,7 +7,7 @@
 #                                                                              #
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
 ?>
-<h1><i class="fa fa-home"></i><?=$Language->text('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_name_items', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1>
+<h1><i class="fa fa-home"></i><?=$Language->text('home_heading_text', escapeHTML(Application::get('BLOGMETA.NAME')))?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_subscribe')?>">Feed</a></span></h1>
 <p><?=$Language->text('home_heading_desc', Application::get('POST.LIST_SIZE'))?></p>
 
 <div class="item-container post">
@@ -17,4 +17,3 @@
 </div>
 
 <?=$PAGINATION['HTML']?>
-
diff --git a/theme/default/html/main.php b/theme/default/html/main.php
index 5a067ef..18d5d40 100644
--- a/theme/default/html/main.php
+++ b/theme/default/html/main.php
@@ -42,10 +42,7 @@ $BLOGMETA_DESC = escapeHTML($BLOGMETA['DESC']);
 
 	<link rel="icon" href="<?=Application::getTemplateURL('rsrc/favicon.ico')?>" />
 	<link rel="stylesheet" href="<?=Application::getTemplateURL('rsrc/css/main.css')?>" title="<?=$BLOGMETA_NAME?>" />
-
-	<link rel="alternate" type="application/rss+xml" title="<?=$Language->text('feed_name_items', $BLOGMETA_NAME)?>" href="<?=Application::getURL('feed/')?>" />
-	<link rel="alternate" type="application/rss+xml" title="<?=$Language->text('feed_name_posts', $BLOGMETA_NAME)?>" href="<?=Application::getURL('feed/post/')?>" />
-	<link rel="alternate" type="application/rss+xml" title="<?=$Language->text('feed_name_pages', $BLOGMETA_NAME)?>" href="<?=Application::getURL('feed/page/')?>" />
+	<link rel="alternate" type="application/rss+xml" title="<?=$BLOGMETA_NAME?>" href="<?=Application::getURL('feed/')?>" />
 
 	<script defer src="<?=Application::getTemplateURL('rsrc/main.js')?>"></script>
 
diff --git a/theme/default/html/page/list.php b/theme/default/html/page/list.php
index 665301e..46a0a09 100644
--- a/theme/default/html/page/list.php
+++ b/theme/default/html/page/list.php
@@ -7,7 +7,7 @@
 #                                                                              #
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
 ?>
-<h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/page/')?>" title="<?=$Language->text('feed_name_pages', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1>
+<h1><i class="fa fa-file-text-o"></i><?=$Language->text('page_overview')?></h1>
 <p><?=$Language->text('page_overview_heading_desc', $PAGINATION['THIS'])?></p>
 
 <div class="item-container page">
diff --git a/theme/default/html/post/list.php b/theme/default/html/post/list.php
index 37fca86..fa063bb 100644
--- a/theme/default/html/post/list.php
+++ b/theme/default/html/post/list.php
@@ -7,7 +7,7 @@
 #                                                                              #
 #%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%#
 ?>
-<h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/post/')?>" title="<?=$Language->text('feed_name_posts', escapeHTML($BLOGMETA['NAME']))?>">Feed</a></span></h1>
+<h1><i class="fa fa-newspaper-o"></i><?=$Language->text('post_overview')?><span class="head-link brackets"><i class="fa fa-rss"></i><a href="<?=Application::getURL('feed/')?>" title="<?=$Language->text('feed_subscribe')?>">Feed</a></span></h1>
 <p><?=$Language->text('post_overview_heading_desc', $PAGINATION['THIS'])?></p>
 
 <div class="item-container post">
diff --git a/theme/default/lang/de.php b/theme/default/lang/de.php
index ed42393..af855ac 100644
--- a/theme/default/lang/de.php
+++ b/theme/default/lang/de.php
@@ -66,6 +66,11 @@ $LANGUAGE['category_empty'] = 'Diese Kategorie ist leer. Es wurden noch keine Be
 #===============================================================================
 $LANGUAGE['search_form_placeholder'] = 'Suchbegriff eingeben …';
 
+#===============================================================================
+# Feed
+#===============================================================================
+$LANGUAGE['feed_subscribe'] = 'Feed abonnieren';
+
 #===============================================================================
 # Error 403
 #===============================================================================
diff --git a/theme/default/lang/en.php b/theme/default/lang/en.php
index 62bb798..ee4ad58 100644
--- a/theme/default/lang/en.php
+++ b/theme/default/lang/en.php
@@ -66,6 +66,11 @@ $LANGUAGE['category_empty'] = 'This category is empty. There are no published po
 #===============================================================================
 $LANGUAGE['search_form_placeholder'] = 'Enter search term …';
 
+#===============================================================================
+# Feed
+#===============================================================================
+$LANGUAGE['feed_subscribe'] = 'Subscribe feed';
+
 #===============================================================================
 # Error 403
 #===============================================================================
-- 
cgit v1.2.3