Fix ppolicy merge from v2.0
This commit is contained in:
parent
d881605fed
commit
ebd4c41a62
|
@ -103,12 +103,6 @@ sub authLogout {
|
|||
|
||||
sub getForm {
|
||||
my ( $self, $req ) = @_;
|
||||
$req->tplParams->{DISPLAY_PPOLICY} =
|
||||
$self->conf->{portalDisplayPasswordPolicy};
|
||||
$req->tplParams->{PPOLICY_MINSIZE} = $self->conf->{passwordPolicyMinSize};
|
||||
$req->tplParams->{PPOLICY_MINLOWER} = $self->conf->{passwordPolicyMinLower};
|
||||
$req->tplParams->{PPOLICY_MINUPPER} = $self->conf->{passwordPolicyMinUpper};
|
||||
$req->tplParams->{PPOLICY_MINDIGIT} = $self->conf->{passwordPolicyMinDigit};
|
||||
if (
|
||||
$req->{error} == PE_PP_CHANGE_AFTER_RESET
|
||||
or $req->{error} == PE_PP_MUST_SUPPLY_OLD_PASSWORD
|
||||
|
@ -123,6 +117,16 @@ sub getForm {
|
|||
and $self->conf->{ldapAllowResetExpiredPassword} )
|
||||
)
|
||||
{
|
||||
$req->tplParams->{DISPLAY_PPOLICY} =
|
||||
$self->conf->{portalDisplayPasswordPolicy};
|
||||
$req->tplParams->{PPOLICY_MINSIZE} =
|
||||
$self->conf->{passwordPolicyMinSize};
|
||||
$req->tplParams->{PPOLICY_MINLOWER} =
|
||||
$self->conf->{passwordPolicyMinLower};
|
||||
$req->tplParams->{PPOLICY_MINUPPER} =
|
||||
$self->conf->{passwordPolicyMinUpper};
|
||||
$req->tplParams->{PPOLICY_MINDIGIT} =
|
||||
$self->conf->{passwordPolicyMinDigit};
|
||||
return 'password';
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -215,6 +215,11 @@ sub display {
|
|||
REQUIRE_OLDPASSWORD => $self->conf->{portalRequireOldPassword},
|
||||
HIDE_OLDPASSWORD => 0,
|
||||
STARS => $self->favAppsRule->( $req, $req->userData ),
|
||||
DISPLAY_PPOLICY => $self->conf->{portalDisplayPasswordPolicy},
|
||||
PPOLICY_MINSIZE => $self->conf->{passwordPolicyMinSize},
|
||||
PPOLICY_MINLOWER => $self->conf->{passwordPolicyMinLower},
|
||||
PPOLICY_MINUPPER => $self->conf->{passwordPolicyMinUpper},
|
||||
PPOLICY_MINDIGIT => $self->conf->{passwordPolicyMinDigit},
|
||||
$self->menu->params($req),
|
||||
(
|
||||
$req->data->{customScript}
|
||||
|
|
Loading…
Reference in New Issue
Block a user