diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-12-17 10:07:52 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-12-17 10:07:52 +0100 |
| commit | 4bd503591469f47e710f1afbf0b5883f7770065d (patch) | |
| tree | 3f125f30b08b2d1a09063469543c974364deb331 /app/views/helpers | |
| parent | 6952a13958417e8441645d0777597db679d0e28d (diff) | |
Rework encoding of search filters (#8324)
Rework:
* https://github.com/FreshRSS/FreshRSS/pull/8222
now that we have:
* https://github.com/FreshRSS/FreshRSS/pull/8293
Follow-up of:
* https://github.com/FreshRSS/FreshRSS/pull/8311
* More simplification
* Deprecate getRawInput
Diffstat (limited to 'app/views/helpers')
| -rw-r--r-- | app/views/helpers/category/update.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/configure/query.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/export/opml.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 2 | ||||
| -rw-r--r-- | app/views/helpers/stream-footer.phtml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml index 231f86ebd..61018a15b 100644 --- a/app/views/helpers/category/update.phtml +++ b/app/views/helpers/category/update.phtml @@ -96,7 +96,7 @@ <div class="group-controls"> <textarea name="filteractions_read" id="filteractions_read" class="w100"><?php foreach ($this->category->filtersAction('read') as $filterRead) { - echo $filterRead->getRawInput(), PHP_EOL; + echo htmlspecialchars($filterRead->__toString(), ENT_NOQUOTES, 'UTF-8'), PHP_EOL; } ?></textarea> <p class="help"><?= _i('help') ?> <?= _t('sub.feed.filteractions.help') ?></p> diff --git a/app/views/helpers/configure/query.phtml b/app/views/helpers/configure/query.phtml index e97ceeeed..fd3877bb6 100644 --- a/app/views/helpers/configure/query.phtml +++ b/app/views/helpers/configure/query.phtml @@ -92,7 +92,7 @@ <div class="form-group"> <label class="group-name" for=""><?= _t('conf.query.filter.search') ?></label> <div class="group-controls"> - <input type="text" class="w100" id="query_search" name="query[search]" value="<?= htmlspecialchars($this->query->getSearch()->getRawInput(), ENT_COMPAT, 'UTF-8') ?>"/> + <input type="text" class="w100" id="query_search" name="query[search]" value="<?= htmlspecialchars($this->query->getSearch()->__toString(), ENT_COMPAT, 'UTF-8') ?>"/> <p class="help"><?= _i('help') ?> <?= _t('gen.menu.search_help') ?></a></p> </div> </div> diff --git a/app/views/helpers/export/opml.phtml b/app/views/helpers/export/opml.phtml index feeb409a5..2e67cd043 100644 --- a/app/views/helpers/export/opml.phtml +++ b/app/views/helpers/export/opml.phtml @@ -89,7 +89,7 @@ function feedsToOutlines(array $feeds, bool $excludeMutedFeeds = false): array { if (!empty($feed->filtersAction('read'))) { $filters = ''; foreach ($feed->filtersAction('read') as $filterRead) { - $filters .= $filterRead->getRawInput() . "\n"; + $filters .= $filterRead->__toString() . "\n"; } $filters = trim($filters); $outline['frss:filtersActionRead'] = $filters; diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 6a7ce83c2..73187cbab 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -304,7 +304,7 @@ <textarea name="filteractions_read" id="filteractions_read" class="w100" placeholder="<?= _t('gen.short.blank_to_disable') ?>"><?php foreach ($this->feed->filtersAction('read') as $filterRead) { - echo $filterRead->getRawInput(), PHP_EOL; + echo htmlspecialchars($filterRead->__toString(), ENT_NOQUOTES, 'UTF-8'), PHP_EOL; } ?></textarea> <p class="help"><?= _i('help') ?> <?= _t('sub.feed.filteractions.help') ?></p> diff --git a/app/views/helpers/stream-footer.phtml b/app/views/helpers/stream-footer.phtml index 5165a115e..4fe93cf7d 100644 --- a/app/views/helpers/stream-footer.phtml +++ b/app/views/helpers/stream-footer.phtml @@ -18,7 +18,7 @@ 'get' => FreshRSS_Context::currentGet(), 'nextGet' => FreshRSS_Context::$next_get, 'idMax' => FreshRSS_Context::$id_max, - 'search' => htmlspecialchars_decode(FreshRSS_Context::$search->getRawInput(), ENT_QUOTES), + 'search' => FreshRSS_Context::$search->__toString(), 'state' => FreshRSS_Context::$state, 'sort' => FreshRSS_Context::$sort, 'order' => FreshRSS_Context::$order, |