mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-02-23 18:19:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Safer htmlspecialchars_utf8 (#4411)

Browse Source 
* Safer htmlspecialchars_utf8
#fix https://github.com/FreshRSS/FreshRSS/issues/4410

* Undefined variable
This commit is contained in:
Alexandre Alapetite
2022-06-11 22:14:46 +02:00
committed by GitHub
parent a398a135f5
commit ec11da4e84
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Context.php
View File

@@ -43,6 +43,7 @@ class FreshRSS_Context {
public static $state = 0;
public static $order = 'DESC';
public static $number = 0;
/** @var FreshRSS_BooleanSearch */
public static $search;
public static $first_id = '';
public static $next_id = '';
@@ -114,6 +115,8 @@ class FreshRSS_Context {
return false;
}
FreshRSS_Context::$search = new FreshRSS_BooleanSearch('');
//Legacy
$oldEntries = (int)FreshRSS_Context::$user_conf->param('old_entries', 0);
$keepMin = (int)FreshRSS_Context::$user_conf->param('keep_history_default', -5);

5
app/layout/header.phtml
View File

@@ -15,8 +15,9 @@
<?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?>
<form action="<?= _url('index', 'index') ?>" method="get">
<div class="stick">
<input type="search" name="search" id="search" class="extend" value="<?php
echo htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8'); ?>" placeholder="<?= _t('gen.menu.search') ?>" />
<input type="search" name="search" id="search" class="extend"
value="<?= htmlspecialchars(htmlspecialchars_decode(FreshRSS_Context::$search, ENT_QUOTES), ENT_COMPAT, 'UTF-8') ?>"
placeholder="<?= _t('gen.menu.search') ?>" />
<?php $get = Minz_Request::param('get', ''); ?>
<?php if ($get != '') { ?>

5
lib/Minz/Helper.php
View File

@@ -16,7 +16,10 @@ class Minz_Helper {
public static function htmlspecialchars_utf8($var) {
if (is_array($var)) {
return array_map(array('Minz_Helper', 'htmlspecialchars_utf8'), $var);
} elseif (is_string($var)) {
return htmlspecialchars($var, ENT_COMPAT, 'UTF-8');
} else {
return $var;
}
return htmlspecialchars($var, ENT_COMPAT, 'UTF-8');
}
}