From cc9e64616f14dc6bcc424edb592908754d6c4e9b Mon Sep 17 00:00:00 2001 From: Anne-Cath Date: Fri, 16 Jan 2026 16:29:15 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B08786=20-=20configuration:=20allow=20cond?= =?UTF-8?q?itions=20on=20the=20allowed=5Flogin=5Ftypes=20field=20-=20clean?= =?UTF-8?q?up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/config.class.inc.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 82d8a786e..5d1755313 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -1954,11 +1954,6 @@ class Config */ protected $m_sDefaultLanguage; - /** - * @var string Type of login process allowed: form|basic|url|external - */ - protected $m_sAllowedLoginTypes; - /** * @var string Name of the PHP variable in which external authentication information is passed by the web server */ @@ -2032,7 +2027,6 @@ class Config $this->m_iFastReloadInterval = DEFAULT_FAST_RELOAD_INTERVAL; $this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED; $this->m_sDefaultLanguage = 'EN US'; - $this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES; $this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE; $this->m_aCharsets = []; $this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED; @@ -2179,7 +2173,6 @@ class Config $this->m_aModuleSettings = isset($MyModuleSettings) ? $MyModuleSettings : []; $this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US'; - $this->m_sAllowedLoginTypes = isset($MySettings['allowed_login_types']) ? trim($MySettings['allowed_login_types']) : DEFAULT_ALLOWED_LOGIN_TYPES; $this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE; $this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : $this->m_sEncryptionKey; $this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary; @@ -2339,7 +2332,7 @@ class Config public function GetAllowedLoginTypes() { - return explode('|', $this->m_sAllowedLoginTypes); + return explode('|', $this->m_aSettings['allowed_login_types']['value']); } public function GetExternalAuthenticationVariable() @@ -2417,7 +2410,6 @@ class Config public function SetAllowedLoginTypes($aAllowedLoginTypes) { - $this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes); $this->Set('allowed_login_types', implode('|', $aAllowedLoginTypes)); } @@ -2495,7 +2487,6 @@ class Config $aSettings['fast_reload_interval'] = $this->m_iFastReloadInterval; $aSettings['secure_connection_required'] = $this->m_bSecureConnectionRequired; $aSettings['default_language'] = $this->m_sDefaultLanguage; - $aSettings['allowed_login_types'] = $this->m_sAllowedLoginTypes; $aSettings['ext_auth_variable'] = $this->m_sExtAuthVariable; $aSettings['encryption_key'] = $this->m_sEncryptionKey; $aSettings['encryption_library'] = $this->m_sEncryptionLibrary; @@ -2599,7 +2590,6 @@ class Config // Old fashioned remaining values $aOtherValues = [ 'default_language' => $this->m_sDefaultLanguage, - 'allowed_login_types' => $this->m_sAllowedLoginTypes, 'ext_auth_variable' => $this->m_sExtAuthVariable, 'encryption_key' => $this->m_sEncryptionKey, 'encryption_library' => $this->m_sEncryptionLibrary,