From 9c6682e7edf8cbad828088cbeeef66c7ecefdd9a Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 2 Jan 2021 21:20:19 +0100
Subject: 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
---
 lib/Minz/Configuration.php   |  4 ++++
 lib/Minz/FrontController.php |  3 ---
 lib/Minz/Log.php             |  4 +++-
 lib/lib_rss.php              | 10 ++++------
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index 93f6b494c..3cf356a2b 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -136,6 +136,10 @@ class Minz_Configuration {
 		}
 	}
 
+	public function configurationSetter() {
+		return $this->configuration_setter;
+	}
+
 	/**
 	 * Return the value of the given param.
 	 *
diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php
index e09b022fc..1f67884fa 100644
--- a/lib/Minz/FrontController.php
+++ b/lib/Minz/FrontController.php
@@ -31,9 +31,6 @@ class Minz_FrontController {
 	 */
 	public function __construct () {
 		try {
-			Minz_Configuration::register('system',
-			                             DATA_PATH . '/config.php',
-			                             FRESHRSS_PATH . '/config.default.php');
 			$this->setReporting();
 
 			Minz_Request::init();
diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php
index f67d16619..f8d024c1f 100644
--- a/lib/Minz/Log.php
+++ b/lib/Minz/Log.php
@@ -37,8 +37,10 @@ class Minz_Log {
 			if ($username == '') {
 				$username = '_';
 			}
-			if ($file_name === null) {
+			if ($file_name == null) {
 				$file_name = join_path(USERS_PATH, $username, 'log.txt');
+			} else {
+				$username = '_';
 			}
 
 			switch ($level) {
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 074982079..9afcc8636 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -169,18 +169,17 @@ function html_only_entity_decode($text) {
 }
 
 function customSimplePie($attributes = array()) {
-	$system_conf = Minz_Configuration::get('system');
-	$limits = $system_conf->limits;
+	$limits = FreshRSS_Context::$system_conf->limits;
 	$simplePie = new SimplePie();
 	$simplePie->set_useragent(FRESHRSS_USERAGENT);
-	$simplePie->set_syslog($system_conf->simplepie_syslog_enabled);
+	$simplePie->set_syslog(FreshRSS_Context::$system_conf->simplepie_syslog_enabled);
 	$simplePie->set_cache_location(CACHE_PATH);
 	$simplePie->set_cache_duration($limits['cache_duration']);
 
 	$feed_timeout = empty($attributes['timeout']) ? 0 : intval($attributes['timeout']);
 	$simplePie->set_timeout($feed_timeout > 0 ? $feed_timeout : $limits['timeout']);
 
-	$curl_options = $system_conf->curl_options;
+	$curl_options = FreshRSS_Context::$system_conf->curl_options;
 	if (isset($attributes['ssl_verify'])) {
 		$curl_options[CURLOPT_SSL_VERIFYHOST] = $attributes['ssl_verify'] ? 2 : 0;
 		$curl_options[CURLOPT_SSL_VERIFYPEER] = $attributes['ssl_verify'] ? true : false;
@@ -331,8 +330,7 @@ function listUsers() {
  * @return true if number of users >= max registrations, false else.
  */
 function max_registrations_reached() {
-	$system_conf = Minz_Configuration::get('system');
-	$limit_registrations = $system_conf->limits['max_registrations'];
+	$limit_registrations = FreshRSS_Context::$system_conf->limits['max_registrations'];
 	$number_accounts = count(listUsers());
 
 	return $limit_registrations > 0 && $number_accounts >= $limit_registrations;
-- 
cgit v1.2.3