Commit 12158467 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Fixes #5425 Added password recovery login attribute to configuration

parent 66ebe3fb
......@@ -517,6 +517,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.110.9 NAME 'fdPasswordRecoveryUseAlternate'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.8.110.10 NAME 'fdPasswordRecoveryLoginAttribute'
DESC 'Fusion Directory - Password recovery login attribute (usually uid)'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
# Object Class
objectclass ( 1.3.6.1.4.1.38414.8.2.1 NAME 'fusionDirectoryConf'
......@@ -562,7 +568,7 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.3 NAME 'fdPasswordRecoveryConf'
fdPasswordRecoveryMailSubject $ fdPasswordRecoveryMailBody $
fdPasswordRecoveryMail2Subject $ fdPasswordRecoveryMail2Body $
fdPasswordRecoveryValidity $ fdPasswordRecoverySalt $
fdPasswordRecoveryUseAlternate
fdPasswordRecoveryUseAlternate $ fdPasswordRecoveryLoginAttribute
) )
# Dashboard Object Class
......
......@@ -374,6 +374,8 @@ class passwordRecovery extends standAlonePage {
$this->usealternates = $config->get_cfg_value('passwordRecoveryUseAlternate');
$this->loginAttribute = $config->get_cfg_value('passwordRecoveryLoginAttribute', 'uid');
@DEBUG(DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $config->get_cfg_value('passwordRecoveryActivated'), "passwordRecoveryActivated");
return ($config->get_cfg_value('passwordRecoveryActivated') == "TRUE");
}
......
......@@ -74,6 +74,11 @@ class recoveryConfig extends simplePlugin
'fdPasswordRecoveryUseAlternate',
FALSE
),
new StringAttribute (
_('Login attribute'), _('Usually uid, but you can use something else for instance in case of SSO'),
'fdPasswordRecoveryLoginAttribute', TRUE,
'uid'
),
)
),
'first_email' => array (
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment