composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 01:58:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2311 - Code cleanup

Browse Source
This commit is contained in:
Eric
2019-08-20 18:04:44 +02:00
parent 51bbe1f79d
commit 9a13d4ce04
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/loginwebpage.class.inc.php
View File

@@ -604,7 +604,6 @@ EOF
{
$aAllPlugins = array();
// Keep only the plugins for the current login mode
$sCurrentLoginMode = isset($_SESSION['login_mode']) ? $_SESSION['login_mode'] : '';
/** @var iLoginExtension $oLoginExtensionInstance */
@@ -613,7 +612,8 @@ EOF
$aLoginModes = $oLoginExtensionInstance->ListSupportedLoginModes();
foreach ($aLoginModes as $sLoginMode)
{
if (empty($sCurrentLoginMode) || ($sLoginMode == 'before') || ($sLoginMode == 'after') || ($sLoginMode == $sCurrentLoginMode))
// Keep only the plugins for the current login mode + before + after
if (empty($sCurrentLoginMode) || ($sLoginMode == $sCurrentLoginMode) || ($sLoginMode == 'before') || ($sLoginMode == 'after'))
{
if (!isset($aAllPlugins[$sLoginMode]))
{
@@ -624,7 +624,7 @@ EOF
}
}
// Order by the config list of allowed types
// Order and filter by the config list of allowed types (allowed_login_types)
$aAllowedLoginModes = array_merge(array('before'), MetaModel::GetConfig()->GetAllowedLoginTypes(), array('after'));
$aPlugins = array();
foreach ($aAllowedLoginModes as $sAllowedMode)