1 files changed, 17 insertions, 17 deletions

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index c4eaaec1b..264d8ff1a 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -27,13 +27,13 @@ class FreshRSS extends Minz_FrontController {
 		Minz_ActionController::$defaultViewType = FreshRSS_View::class;
 
 		FreshRSS_Context::initSystem();
-		if (FreshRSS_Context::$system_conf == null) {
+		if (!FreshRSS_Context::hasSystemConf()) {
 			$message = 'Error during context system init!';
 			Minz_Error::error(500, $message, false);
 			die($message);
 		}
 
-		if (FreshRSS_Context::$system_conf->logo_html != '') {
+		if (FreshRSS_Context::systemConf()->logo_html != '') {
 			// Relax Content Security Policy to allow external images if a custom logo HTML is used
 			Minz_ActionController::_defaultCsp([
 				'default-src' => "'self'",
@@ -47,10 +47,10 @@ class FreshRSS extends Minz_FrontController {
 		// Auth has to be initialized before using currentUser session parameter
 		// because it’s this part which create this parameter.
 		self::initAuth();
-		if (FreshRSS_Context::$user_conf == null) {
+		if (!FreshRSS_Context::hasUserConf()) {
 			FreshRSS_Context::initUser();
 		}
-		if (FreshRSS_Context::$user_conf == null) {
+		if (!FreshRSS_Context::hasUserConf()) {
 			$message = 'Error during context user init!';
 			Minz_Error::error(500, $message, false);
 			die($message);
@@ -60,28 +60,28 @@ class FreshRSS extends Minz_FrontController {
 		self::initI18n();
 		self::loadNotifications();
 		// Enable extensions for the current (logged) user.
-		if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) {
-			$ext_list = FreshRSS_Context::$user_conf->extensions_enabled;
+		if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::systemConf()->allow_anonymous) {
+			$ext_list = FreshRSS_Context::userConf()->extensions_enabled;
 			Minz_ExtensionManager::enableByList($ext_list, 'user');
 		}
 
-		if (FreshRSS_Context::$system_conf->force_email_validation && !FreshRSS_Auth::hasAccess('admin')) {
+		if (FreshRSS_Context::systemConf()->force_email_validation && !FreshRSS_Auth::hasAccess('admin')) {
 			self::checkEmailValidated();
 		}
 
-		Minz_ExtensionManager::callHook('freshrss_init');
+		Minz_ExtensionManager::callHookVoid('freshrss_init');
 	}
 
 	private static function initAuth(): void {
 		FreshRSS_Auth::init();
 		if (Minz_Request::isPost()) {
-			if (FreshRSS_Context::$system_conf == null || !(FreshRSS_Auth::isCsrfOk() ||
+			if (!FreshRSS_Context::hasSystemConf() || !(FreshRSS_Auth::isCsrfOk() ||
 				(Minz_Request::controllerName() === 'auth' && Minz_Request::actionName() === 'login') ||
 				(Minz_Request::controllerName() === 'user' && Minz_Request::actionName() === 'create' && !FreshRSS_Auth::hasAccess('admin')) ||
 				(Minz_Request::controllerName() === 'feed' && Minz_Request::actionName() === 'actualize'
-					&& FreshRSS_Context::$system_conf->allow_anonymous_refresh) ||
+					&& FreshRSS_Context::systemConf()->allow_anonymous_refresh) ||
 				(Minz_Request::controllerName() === 'javascript' && Minz_Request::actionName() === 'actualize'
-					&& FreshRSS_Context::$system_conf->allow_anonymous)
+					&& FreshRSS_Context::systemConf()->allow_anonymous)
 				)) {
 				// Token-based protection against XSRF attacks, except for the login or self-create user forms
 				self::initI18n();
@@ -91,14 +91,14 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	private static function initI18n(): void {
-		$userLanguage = isset(FreshRSS_Context::$user_conf) ? FreshRSS_Context::$user_conf->language : null;
-		$systemLanguage = isset(FreshRSS_Context::$system_conf) ? FreshRSS_Context::$system_conf->language : null;
+		$userLanguage = FreshRSS_Context::hasUserConf() ? FreshRSS_Context::userConf()->language : null;
+		$systemLanguage = FreshRSS_Context::hasSystemConf() ? FreshRSS_Context::systemConf()->language : null;
 		$language = Minz_Translate::getLanguage($userLanguage, Minz_Request::getPreferredLanguages(), $systemLanguage);
 
 		Minz_Session::_param('language', $language);
 		Minz_Translate::init($language);
 
-		$timezone = isset(FreshRSS_Context::$user_conf) ? FreshRSS_Context::$user_conf->timezone : '';
+		$timezone = FreshRSS_Context::hasUserConf() ? FreshRSS_Context::userConf()->timezone : '';
 		if ($timezone == '') {
 			$timezone = FreshRSS_Context::defaultTimeZone();
 		}
@@ -111,10 +111,10 @@ class FreshRSS extends Minz_FrontController {
 	}
 
 	public static function loadStylesAndScripts(): void {
-		if (FreshRSS_Context::$user_conf == null) {
+		if (!FreshRSS_Context::hasUserConf()) {
 			return;
 		}
-		$theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme);
+		$theme = FreshRSS_Themes::load(FreshRSS_Context::userConf()->theme);
 		if ($theme) {
 			foreach(array_reverse($theme['files']) as $file) {
 				switch (substr($file, -3)) {
@@ -167,7 +167,7 @@ class FreshRSS extends Minz_FrontController {
 
 	private static function checkEmailValidated(): void {
 		$email_not_verified = FreshRSS_Auth::hasAccess() &&
-			FreshRSS_Context::$user_conf !== null && FreshRSS_Context::$user_conf->email_validation_token !== '';
+			FreshRSS_Context::hasUserConf() && FreshRSS_Context::userConf()->email_validation_token !== '';
 		$action_is_allowed = (
 			Minz_Request::is('user', 'validateEmail') ||
 			Minz_Request::is('user', 'sendValidationEmail') ||