From 0a38aa7456ccb2875aac5dc20a6f15d3956bb93a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Wed, 3 May 2023 00:37:04 +0200 Subject: Automatic trusted_sources during install (#5358) * Automatic trusted_sources during install Fix https://github.com/FreshRSS/FreshRSS/issues/5357 * Fix install for http_auth * Update lib/lib_rss.php Co-authored-by: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com> * Fill null exception e-mail * Revert some syntax * Minor parentheses --- app/Controllers/authController.php | 2 +- app/Controllers/userController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Controllers') diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php index b54953b1d..54935ab1b 100644 --- a/app/Controllers/authController.php +++ b/app/Controllers/authController.php @@ -75,7 +75,7 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController { break; case 'http_auth': Minz_Error::error(403, array('error' => array(_t('feedback.access.denied'), - ' [HTTP Remote-User=' . htmlspecialchars(httpAuthUser(), ENT_NOQUOTES, 'UTF-8') . + ' [HTTP Remote-User=' . htmlspecialchars(httpAuthUser(false), ENT_NOQUOTES, 'UTF-8') . ' ; Remote IP address=' . ($_SERVER['REMOTE_ADDR'] ?? '') . ']' )), false); break; diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index b44ec5d46..ed8e6cc44 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -212,7 +212,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { } /** @param array $userConfigOverride */ - public static function createUser(string $new_user_name, string $email, string $passwordPlain, + public static function createUser(string $new_user_name, ?string $email, string $passwordPlain, array $userConfigOverride = [], bool $insertDefaultFeeds = true): bool { $userConfig = []; -- cgit v1.2.3