mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-04 13:14:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename param specialchars to plaintext (#6809)

Browse Source 
https://github.com/FreshRSS/FreshRSS/pull/6800#discussion_r1756435762
This commit is contained in:
Alexandre Alapetite
2024-09-15 12:00:46 +02:00
committed by GitHub
parent 34d933d43c
commit 469a42d9c3
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/authController.php
View File

@@ -187,8 +187,8 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
Minz_Request::forward(['c' => 'auth', 'a' => 'login'], false);
}
} elseif (FreshRSS_Context::systemConf()->unsafe_autologin_enabled) {
$username = Minz_Request::paramString('u', specialchars: true);
$password = Minz_Request::paramString('p', specialchars: true);
$username = Minz_Request::paramString('u', plaintext: true);
$password = Minz_Request::paramString('p', plaintext: true);
Minz_Request::_param('p');
if ($username === '') {

2
app/Controllers/configureController.php
View File

@@ -202,7 +202,7 @@ class FreshRSS_configure_Controller extends FreshRSS_ActionController {
$this->view->list_keys = SHORTCUT_KEYS;
if (Minz_Request::isPost()) {
$shortcuts = Minz_Request::paramArray('shortcuts', specialchars: true);
$shortcuts = Minz_Request::paramArray('shortcuts', plaintext: true);
if (Minz_Request::paramBoolean('load_default_shortcuts')) {
$default = Minz_Configuration::load(FRESHRSS_PATH . '/config-user.default.php');
$shortcuts = $default['shortcuts'];

24
lib/Minz/Request.php
View File

@@ -62,26 +62,26 @@ class Minz_Request {
}
/**
* @param bool $specialchars `true` to return special characters, `false` (default) to XML-encode them
* @param bool $plaintext `true` to return special characters without any escaping (unsafe), `false` (default) to XML-encode them
* @return array<string|int,string|array<string,string|int|bool>>
*/
public static function paramArray(string $key, bool $specialchars = false): array {
public static function paramArray(string $key, bool $plaintext = false): array {
if (empty(self::$params[$key]) || !is_array(self::$params[$key])) {
return [];
}
return $specialchars ? self::$params[$key] : Minz_Helper::htmlspecialchars_utf8(self::$params[$key]);
return $plaintext ? self::$params[$key] : Minz_Helper::htmlspecialchars_utf8(self::$params[$key]);
}
/**
* @param bool $specialchars `true` to return special characters, `false` (default) to XML-encode them
* @param bool $plaintext `true` to return special characters without any escaping (unsafe), `false` (default) to XML-encode them
* @return array<string>
*/
public static function paramArrayString(string $key, bool $specialchars = false): array {
public static function paramArrayString(string $key, bool $plaintext = false): array {
if (empty(self::$params[$key]) || !is_array(self::$params[$key])) {
return [];
}
$result = array_filter(self::$params[$key], 'is_string');
return $specialchars ? $result : Minz_Helper::htmlspecialchars_utf8($result);
return $plaintext ? $result : Minz_Helper::htmlspecialchars_utf8($result);
}
public static function paramTernary(string $key): ?bool {
@@ -113,14 +113,14 @@ class Minz_Request {
}
/**
* @param bool $specialchars `true` to return special characters, `false` (default) to XML-encode them
* @param bool $plaintext `true` to return special characters without any escaping (unsafe), `false` (default) to XML-encode them
*/
public static function paramStringNull(string $key, bool $specialchars = false): ?string {
public static function paramStringNull(string $key, bool $plaintext = false): ?string {
if (isset(self::$params[$key])) {
$s = self::$params[$key];
if (is_string($s)) {
$s = trim($s);
return $specialchars ? $s : htmlspecialchars($s, ENT_COMPAT, 'UTF-8');
return $plaintext ? $s : htmlspecialchars($s, ENT_COMPAT, 'UTF-8');
}
if (is_int($s) || is_bool($s)) {
return (string)$s;
@@ -130,10 +130,10 @@ class Minz_Request {
}
/**
* @param bool $specialchars `true` to return special characters, `false` (default) to XML-encode them
* @param bool $plaintext `true` to return special characters without any escaping (unsafe), `false` (default) to XML-encode them
*/
public static function paramString(string $key, bool $specialchars = false): string {
return self::paramStringNull($key, $specialchars) ?? '';
public static function paramString(string $key, bool $plaintext = false): string {
return self::paramStringNull($key, $plaintext) ?? '';
}
/**