From 9fbde0605bef39be3f92e316806d33864b044967 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 17 May 2025 22:52:30 +0200
Subject: Keep sort and order during navigation (#7585)

* Keep sort and order during navigation
fix https://github.com/FreshRSS/FreshRSS/issues/7584

* Sanitize

* Minor format

* Avoid uneeded HTML escaping
---
 app/layout/aside_feed.phtml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index ca4fd1911..3d4103731 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -3,15 +3,21 @@
 	/** @var FreshRSS_View $this */
 	$actual_view = Minz_Request::actionName();
 	$class = '';
-		if (FreshRSS_Context::userConf()->hide_read_feeds &&
-			(FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) || FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_OR_NOT_READ)) &&
-			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
-			$class = ' state_unread';
-		}
+	if (FreshRSS_Context::userConf()->hide_read_feeds &&
+		(FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) || FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_OR_NOT_READ)) &&
+		!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
 
-	$state_filter_manual = Minz_Request::paramString('state');
-	if ($state_filter_manual !== '') {
-		$state_filter_manual = '&state=' . $state_filter_manual;
+	$state_filter_manual = '';
+	if (($s = Minz_Request::paramString('state', plaintext: true)) !== '' && ctype_digit($s)) {
+		$state_filter_manual .= '&state=' . $s;
+	}
+	if (($s = Minz_Request::paramString('sort', plaintext: true)) !== '' && ctype_alpha($s)) {
+		$state_filter_manual .= '&sort=' . $s;
+	}
+	if (($s = Minz_Request::paramString('order', plaintext: true)) !== '' && ctype_alpha($s)) {
+		$state_filter_manual .= '&order=' . $s;
 	}
 ?>
 <nav class="nav aside aside_feed<?= $class ?>" id="aside_feed">
-- 
cgit v1.2.3