From 5e7758d39d084dbe829dfc22f78de026b01df423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <fred@kanboard.net>
Date: Tue, 3 Mar 2020 20:33:41 -0800
Subject: [PATCH] Fix invalid RSS feed encoding

Fixes #4426
---
 app/Template/feed/project.php | 8 ++++----
 app/Template/feed/user.php    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Template/feed/project.php b/app/Template/feed/project.php
index 7c87823fb..f9e9c1319 100644
--- a/app/Template/feed/project.php
+++ b/app/Template/feed/project.php
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <title><?= e("%s's activity", $project['name']) ?></title>
+    <title><?= t("%s's activity", $project['name']) ?></title>
     <updated><?= date(DATE_ATOM) ?></updated>
     <link rel="alternate" type="text/html" href="<?= $this->url->base() ?>"/>
     <link rel="self" type="application/atom+xml" href="<?= $this->url->href('FeedController', 'project', ['token' => $project['token']], false, '', true) ?>"/>
@@ -13,9 +13,9 @@
             <updated><?= date(DATE_ATOM, $event['date_creation']) ?></updated>
             <published><?= date(DATE_ATOM, $event['date_creation']) ?></published>
             <author>
-                <name><?= $event['author'] ?></name>
+                <name><?= htmlentities($event['author'], ENT_XML1) ?></name>
             </author>
-            <title><?= $event['event_title'] ?></title>
+            <title><?= htmlentities($event['event_title'], ENT_XML1) ?></title>
             <content type="html"><![CDATA[<?= $event['event_content'] ?>]]></content>
         </entry>
     <?php endforeach ?>
diff --git a/app/Template/feed/user.php b/app/Template/feed/user.php
index 6ecd42a8a..89f309303 100644
--- a/app/Template/feed/user.php
+++ b/app/Template/feed/user.php
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?= '<?xml version="1.0" encoding="UTF-8"?>' ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <title><?= e('Project activities for %s', $this->user->getFullname($user)) ?></title>
+    <title><?= t('Project activities for %s', $this->user->getFullname($user)) ?></title>
     <updated><?= date(DATE_ATOM) ?></updated>
     <link rel="alternate" type="text/html" href="<?= $this->url->base() ?>"/>
     <link rel="self" type="application/atom+xml" href="<?= $this->url->href('FeedController', 'user', ['token' => $user['token']], false, '', true) ?>"/>
@@ -13,9 +13,9 @@
             <updated><?= date(DATE_ATOM, $event['date_creation']) ?></updated>
             <published><?= date(DATE_ATOM, $event['date_creation']) ?></published>
             <author>
-                <name><?= $event['author'] ?></name>
+                <name><?= htmlentities($event['author'], ENT_XML1) ?></name>
             </author>
-            <title><?= $event['event_title'] ?></title>
+            <title><?= htmlentities($event['event_title'], ENT_XML1) ?></title>
             <content type="html"><![CDATA[<?= $event['event_content'] ?>]]></content>
         </entry>
     <?php endforeach ?>