Commit 1d2db059 authored by Christophe Maudoux's avatar Christophe Maudoux 🐛
Browse files

Tidy

parent 466b6a32
Pipeline #14468 passed with stages
in 17 minutes and 4 seconds
...@@ -244,15 +244,15 @@ sub display { ...@@ -244,15 +244,15 @@ sub display {
PING => $self->conf->{portalPingInterval}, PING => $self->conf->{portalPingInterval},
REQUIRE_OLDPASSWORD => REQUIRE_OLDPASSWORD =>
$self->requireOldPwd->( $req, $req->userData ), $self->requireOldPwd->( $req, $req->userData ),
DONT_STORE_PASSWORD => $self->conf->{browsersDontStorePassword}, DONT_STORE_PASSWORD => $self->conf->{browsersDontStorePassword},
HIDE_OLDPASSWORD => 0, HIDE_OLDPASSWORD => 0,
PPOLICY_NOPOLICY => !$self->isPP(), PPOLICY_NOPOLICY => !$self->isPP(),
DISPLAY_PPOLICY => $self->conf->{portalDisplayPasswordPolicy}, DISPLAY_PPOLICY => $self->conf->{portalDisplayPasswordPolicy},
PPOLICY_MINSIZE => $self->conf->{passwordPolicyMinSize}, PPOLICY_MINSIZE => $self->conf->{passwordPolicyMinSize},
PPOLICY_MINLOWER => $self->conf->{passwordPolicyMinLower}, PPOLICY_MINLOWER => $self->conf->{passwordPolicyMinLower},
PPOLICY_MINUPPER => $self->conf->{passwordPolicyMinUpper}, PPOLICY_MINUPPER => $self->conf->{passwordPolicyMinUpper},
PPOLICY_MINDIGIT => $self->conf->{passwordPolicyMinDigit}, PPOLICY_MINDIGIT => $self->conf->{passwordPolicyMinDigit},
PPOLICY_MINSPECHAR => $self->conf->{passwordPolicyMinSpeChar}, PPOLICY_MINSPECHAR => $self->conf->{passwordPolicyMinSpeChar},
( (
$self->conf->{passwordPolicyMinSpeChar} || $self->speChars() $self->conf->{passwordPolicyMinSpeChar} || $self->speChars()
? ( PPOLICY_ALLOWEDSPECHAR => $self->speChars() ) ? ( PPOLICY_ALLOWEDSPECHAR => $self->speChars() )
...@@ -397,7 +397,8 @@ sub display { ...@@ -397,7 +397,8 @@ sub display {
? ( CUSTOM_SCRIPT => $req->data->{customScript} ) ? ( CUSTOM_SCRIPT => $req->data->{customScript} )
: () : ()
), ),
ENABLE_PASSWORD_DISPLAY => $self->conf->{portalEnablePasswordDisplay}, ENABLE_PASSWORD_DISPLAY =>
$self->conf->{portalEnablePasswordDisplay},
); );
# Display captcha if it's enabled # Display captcha if it's enabled
...@@ -443,9 +444,9 @@ sub display { ...@@ -443,9 +444,9 @@ sub display {
OLDPASSWORD => $self->checkXSSAttack( 'oldpassword', OLDPASSWORD => $self->checkXSSAttack( 'oldpassword',
$req->data->{oldpassword} ) ? "" $req->data->{oldpassword} ) ? ""
: $req->data->{oldpassword}, : $req->data->{oldpassword},
HIDE_OLDPASSWORD => $self->conf->{hideOldPassword}, HIDE_OLDPASSWORD => $self->conf->{hideOldPassword},
DONT_STORE_PASSWORD => $self->conf->{browsersDontStorePassword}, DONT_STORE_PASSWORD => $self->conf->{browsersDontStorePassword},
PPOLICY_NOPOLICY => !$self->isPP(), PPOLICY_NOPOLICY => !$self->isPP(),
DISPLAY_PPOLICY => $self->conf->{portalDisplayPasswordPolicy}, DISPLAY_PPOLICY => $self->conf->{portalDisplayPasswordPolicy},
PPOLICY_MINSIZE => $self->conf->{passwordPolicyMinSize}, PPOLICY_MINSIZE => $self->conf->{passwordPolicyMinSize},
PPOLICY_MINLOWER => $self->conf->{passwordPolicyMinLower}, PPOLICY_MINLOWER => $self->conf->{passwordPolicyMinLower},
...@@ -493,7 +494,7 @@ sub display { ...@@ -493,7 +494,7 @@ sub display {
&& $self->conf->{impersonationRule} && $self->conf->{impersonationRule}
&& $self->conf->{findUserSearchingAttributes} ) && $self->conf->{findUserSearchingAttributes} )
{ {
$slogin = $req->data->{findUser}; $slogin = $req->data->{findUser};
$fields = $plugin->buildForm(); $fields = $plugin->buildForm();
} }
......
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