From fd1b5e9343b6fe92b4e5dfbbc2f01ddfcd010af9 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 12 Sep 2024 11:04:49 +0200 Subject: Fix inversed encoding logic in paramArray (#6800) * Fix inversed encoding logic in paramArray https://github.com/FreshRSS/FreshRSS/pull/6797#discussion_r1754661634 Also fix the possibility to use `<'&">` in shortcuts, and some minor encoding bugs in user queries * Forgot paramArrayString --- app/Models/BooleanSearch.php | 1 + app/Models/UserQuery.php | 2 ++ 2 files changed, 3 insertions(+) (limited to 'app/Models') diff --git a/app/Models/BooleanSearch.php b/app/Models/BooleanSearch.php index 88069c461..9e9dec2a2 100644 --- a/app/Models/BooleanSearch.php +++ b/app/Models/BooleanSearch.php @@ -402,6 +402,7 @@ class FreshRSS_BooleanSearch { return $this->getRawInput(); } + /** @return string Plain text search query. Must be XML-encoded or URL-encoded depending on the situation */ public function getRawInput(): string { return $this->raw_input; } diff --git a/app/Models/UserQuery.php b/app/Models/UserQuery.php index dcd17393e..d701b6b44 100644 --- a/app/Models/UserQuery.php +++ b/app/Models/UserQuery.php @@ -13,6 +13,7 @@ class FreshRSS_UserQuery { private string $get = ''; private string $get_name = ''; private string $get_type = ''; + /** XML-encoded name */ private string $name = ''; private string $order = ''; private FreshRSS_BooleanSearch $search; @@ -25,6 +26,7 @@ class FreshRSS_UserQuery { private array $categories; /** @var array $labels */ private array $labels; + /** XML-encoded description */ private string $description = ''; private string $imageUrl = ''; -- cgit v1.2.3