aboutsummaryrefslogtreecommitdiff
path: root/app/Models
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-09-12 11:04:49 +0200
committerGravatar GitHub <noreply@github.com> 2024-09-12 11:04:49 +0200
commitfd1b5e9343b6fe92b4e5dfbbc2f01ddfcd010af9 (patch)
tree5cc4e7399212d2fdce401465e3590f2275b16c26 /app/Models
parentd1f1e42c2b180f34276d7ddd1a2bfeaf4e59ed05 (diff)
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
Diffstat (limited to 'app/Models')
-rw-r--r--app/Models/BooleanSearch.php1
-rw-r--r--app/Models/UserQuery.php2
2 files changed, 3 insertions, 0 deletions
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<int,FreshRSS_Tag> $labels */
private array $labels;
+ /** XML-encoded description */
private string $description = '';
private string $imageUrl = '';