diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-05-03 00:37:04 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-05-03 00:37:04 +0200 |
| commit | 0a38aa7456ccb2875aac5dc20a6f15d3956bb93a (patch) | |
| tree | 0b116f889399fc69e371adff85576142f7e1d596 /app/Models | |
| parent | bd9fa803f1f0c23face77fa1bc550d1198ce5ad6 (diff) | |
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
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/Auth.php | 2 | ||||
| -rw-r--r-- | app/Models/SystemConfiguration.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/Models/Auth.php b/app/Models/Auth.php index e868e1b4f..d048460f6 100644 --- a/app/Models/Auth.php +++ b/app/Models/Auth.php @@ -75,7 +75,7 @@ class FreshRSS_Auth { $email = null; if (FreshRSS_Context::$system_conf->http_auth_auto_register_email_field !== '' && isset($_SERVER[FreshRSS_Context::$system_conf->http_auth_auto_register_email_field])) { - $email = $_SERVER[FreshRSS_Context::$system_conf->http_auth_auto_register_email_field]; + $email = (string)$_SERVER[FreshRSS_Context::$system_conf->http_auth_auto_register_email_field]; } $language = Minz_Translate::getLanguage(null, Minz_Request::getPreferredLanguages(), FreshRSS_Context::$system_conf->language); Minz_Translate::init($language); diff --git a/app/Models/SystemConfiguration.php b/app/Models/SystemConfiguration.php index 2f68a4fe9..6cb3569f1 100644 --- a/app/Models/SystemConfiguration.php +++ b/app/Models/SystemConfiguration.php @@ -7,7 +7,7 @@ * @property-read bool $allow_robots * @property bool $api_enabled * @property string $archiving - * @property string $auth_type + * @property 'form'|'http_auth'|'none' $auth_type * @property string $auto_update_url * @property-read array<int,mixed> $curl_options * @property string $default_user @@ -23,7 +23,7 @@ * @property-read string $salt * @property-read bool $simplepie_syslog_enabled * @property bool $unsafe_autologin_enabled - * @property-read array<string> $trusted_sources + * @property array<string> $trusted_sources */ final class FreshRSS_SystemConfiguration extends Minz_Configuration { |