From 049ee52fb5e044628195425655338c379602435e Mon Sep 17 00:00:00 2001
From: Eugene Molotov <eugene.molotov@yandex.ru>
Date: Mon, 16 Jul 2018 15:32:24 +0500
Subject: [PATCH] Implemented feed item categories (#746)

---
 formats/AtomFormat.php | 11 +++++++++++
 formats/HtmlFormat.php | 15 +++++++++++++++
 formats/MrssFormat.php | 11 +++++++++++
 static/HtmlFormat.css  |  4 +++-
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 6ebdf771..9bd08bd1 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -40,6 +40,16 @@ class AtomFormat extends FormatAbstract{
 				}
 			}
 
+			$entryCategories = '';
+			if(isset($item['categories'])) {
+				foreach($item['categories'] as $category) {
+					$entryCategories .= '<category term="'
+					. $this->xml_encode($category)
+					. '"/>'
+					. PHP_EOL;
+				}
+			}
+
 			$entries .= <<<EOD
 
 	<entry>
@@ -52,6 +62,7 @@ class AtomFormat extends FormatAbstract{
 		<updated>{$entryTimestamp}</updated>
 		<content type="html">{$entryContent}</content>
 		{$entryEnclosures}
+		{$entryCategories}
 	</entry>
 
 EOD;
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index fc4adcc0..c4c5012a 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -47,6 +47,20 @@ class HtmlFormat extends FormatAbstract {
 				$entryEnclosures .= '</div>';
 			}
 
+			$entryCategories = '';
+			if(isset($item['categories'])) {
+				$entryCategories = '<div class="categories"><p>Categories:</p>';
+
+				foreach($item['categories'] as $category) {
+
+					$entryCategories .= '<li class="category">'
+					. $this->sanitizeHtml($category)
+					. '</li>';
+				}
+
+				$entryCategories .= '</div>';
+			}
+
 			$entries .= <<<EOD
 
 <section class="feeditem">
@@ -55,6 +69,7 @@ class HtmlFormat extends FormatAbstract {
 	{$entryAuthor}
 	{$entryContent}
 	{$entryEnclosures}
+	{$entryCategories}
 </section>
 
 EOD;
diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index 8f54ef0b..6d079288 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -51,6 +51,16 @@ Some media files might not be shown to you. Consider using the ATOM format inste
 				}
 			}
 
+			$entryCategories = '';
+			if(isset($item['categories'])) {
+
+				foreach($item['categories'] as $category) {
+					$entryCategories .= '<category>'
+					. $category  . '</category>'
+					. PHP_EOL;
+				}
+			}
+
 			$items .= <<<EOD
 
 	<item>
@@ -61,6 +71,7 @@ Some media files might not be shown to you. Consider using the ATOM format inste
 		<description>{$itemContent}{$entryEnclosuresWarning}</description>
 		<author>{$itemAuthor}</author>
 		{$entryEnclosures}
+		{$entryCategories}
 	</item>
 
 EOD;
diff --git a/static/HtmlFormat.css b/static/HtmlFormat.css
index 9e0ee13e..195a9b0d 100644
--- a/static/HtmlFormat.css
+++ b/static/HtmlFormat.css
@@ -69,12 +69,14 @@ a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link,
 
 }
 
+section > div.content, section > div.categories,
 section > div.content, section > div.attachments {
 
 	padding: 10px;
 
 }
 
+section > div.categories > li.category,
 section > div.attachments > li.enclosure {
 
 	list-style-type: circle;
@@ -114,4 +116,4 @@ img {
 
   max-width: 100%;
 
-}
\ No newline at end of file
+}