diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2021-01-02 21:20:19 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2021-01-02 21:20:19 +0100 |
| commit | 9c6682e7edf8cbad828088cbeeef66c7ecefdd9a (patch) | |
| tree | c8c8a6ba34d49d22497a14ddaf18ae97d8cd5bb1 /p/api/fever.php | |
| parent | 7bc2cc5825547f5b5cf15005fda937e06065b45d (diff) | |
Avoid manual initialisations of system or user configuration (#3070)
* Avoid manual intialisations of system or user configuration
More consistent use of Context
* Simplify FreshRSS_Context::initUser
* Remove a few manual get_user_configuration
* A bit of debugging
* Fix context user init
* Fix install
* Fix concurrency
Concurrent requests could lead to bad race condition
* Fix actualize cron
Fix case when system i initialised several times
Diffstat (limited to 'p/api/fever.php')
| -rw-r--r-- | p/api/fever.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/p/api/fever.php b/p/api/fever.php index 64e6dfd65..ae9e45084 100644 --- a/p/api/fever.php +++ b/p/api/fever.php @@ -14,10 +14,9 @@ // BOOTSTRAP FreshRSS require(__DIR__ . '/../../constants.php'); require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader -Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php'); +FreshRSS_Context::initSystem(); // check if API is enabled globally -FreshRSS_Context::$system_conf = Minz_Configuration::get('system'); if (!FreshRSS_Context::$system_conf->api_enabled) { Minz_Log::warning('Fever API: serviceUnavailable() ' . debugInfo(), API_LOG); header('HTTP/1.1 503 Service Unavailable'); @@ -159,10 +158,8 @@ class FeverAPI $username = @file_get_contents(DATA_PATH . '/fever/.key-' . sha1(FreshRSS_Context::$system_conf->salt) . '-' . $feverKey . '.txt', false); if ($username != false) { $username = trim($username); - Minz_Session::_param('currentUser', $username); - $user_conf = get_user_configuration($username); - if ($user_conf != null && $feverKey === $user_conf->feverKey && $user_conf->enabled) { - FreshRSS_Context::$user_conf = $user_conf; + FreshRSS_Context::initUser($username); + if (FreshRSS_Context::$user_conf != null && $feverKey === FreshRSS_Context::$user_conf->feverKey && FreshRSS_Context::$user_conf->enabled) { Minz_Translate::init(FreshRSS_Context::$user_conf->language); $this->entryDAO = FreshRSS_Factory::createEntryDao(); $this->feedDAO = FreshRSS_Factory::createFeedDao(); |