worteks
/
lemonldap-ng
mirror of https://gitlab.ow2.org/lemonldap-ng/lemonldap-ng
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-order menu & Update langs (#2266)

Browse Source
Moo
Christophe Maudoux 5 years ago
parent 01beb5d48b
commit 05096327c0
16 changed files with 118 additions and 49 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm
  2. 2
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
  3. 2
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
  4. 137
      lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
  5. 2
      lemonldap-ng-manager/site/htdocs/static/languages/ar.json
  6. 2
      lemonldap-ng-manager/site/htdocs/static/languages/de.json
  7. 2
      lemonldap-ng-manager/site/htdocs/static/languages/en.json
  8. 2
      lemonldap-ng-manager/site/htdocs/static/languages/fr.json
  9. 2
      lemonldap-ng-manager/site/htdocs/static/languages/it.json
  10. 2
      lemonldap-ng-manager/site/htdocs/static/languages/pl.json
  11. 2
      lemonldap-ng-manager/site/htdocs/static/languages/tr.json
  12. 2
      lemonldap-ng-manager/site/htdocs/static/languages/vi.json
  13. 2
      lemonldap-ng-manager/site/htdocs/static/languages/zh.json
  14. 2
      lemonldap-ng-manager/site/htdocs/static/reverseTree.json
  15. 2
      lemonldap-ng-manager/site/htdocs/static/struct.json
  16. 2
      lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Password/Base.pm

2
lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm
Unescape View File

@ -224,7 +224,7 @@ sub defaultValues {
'pamAuthnLevel' => 2,
'pamService' => 'login',
'passwordDB' => 'Demo',
'passwordPolicy' => 1,
'passwordPolicyActivation' => 1,
'passwordPolicyMinDigit' => 0,
'passwordPolicyMinLower' => 0,
'passwordPolicyMinSize' => 0,

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
Unescape View File

@ -2483,7 +2483,7 @@ m[^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
],
'type' => 'select'
},
'passwordPolicy' => {
'passwordPolicyActivation' => {
'default' => 1,
'type' => 'boolOrExpr'
},

2
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
Unescape View File

@ -1454,7 +1454,7 @@ sub attributes {
type => 'bool',
documentation => 'Hide old password in portal',
},
passwordPolicy => {
passwordPolicyActivation => {
type => 'boolOrExpr',
default => 1,
documentation => 'Enable password policy',

137
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
Unescape View File

@ -79,14 +79,22 @@ sub tree {
'portalRequireOldPassword',
'hideOldPassword',
'mailOnPasswordChange',
'passwordPolicy',
]
},
{
title => 'passwordPolicy',
help =>
'portalcustom.html#password-policy',
form => 'simpleInputContainer',
nodes => [
'passwordPolicyActivation',
'portalDisplayPasswordPolicy',
'passwordPolicyMinSize',
'passwordPolicyMinLower',
'passwordPolicyMinUpper',
'passwordPolicyMinDigit',
'passwordPolicyMinSpeChar',
'passwordPolicySpecialChar',
'portalDisplayPasswordPolicy',
]
},
{
@ -125,7 +133,10 @@ sub tree {
'start.html#authentication-users-and-password-databases',
form => 'authParams',
nodes => [
'authentication', 'userDB', 'passwordDB', 'registerDB'
'authentication',
'userDB',
'passwordDB',
'registerDB'
],
nodes_cond => [ {
title => 'adParams',
@ -137,7 +148,8 @@ sub tree {
title => 'choiceParams',
help => 'authchoice.html',
nodes => [
'authChoiceParam', 'authChoiceModules',
'authChoiceParam',
'authChoiceModules',
'authChoiceAuthBasic'
]
},
@ -224,8 +236,10 @@ sub tree {
title => 'facebookParams',
help => 'authfacebook.html',
nodes => [
'facebookAuthnLevel', 'facebookExportedVars',
'facebookAppId', 'facebookAppSecret',
'facebookAuthnLevel',
'facebookExportedVars',
'facebookAppId',
'facebookAppSecret',
'facebookUserField'
]
},
@ -234,8 +248,10 @@ sub tree {
form => 'simpleInputContainer',
help => 'authkerberos.html',
nodes => [
'krbAuthnLevel', 'krbKeytab',
'krbByJs', 'krbRemoveDomain'
'krbAuthnLevel',
'krbKeytab',
'krbByJs',
'krbRemoveDomain'
]
},
{
@ -302,9 +318,12 @@ sub tree {
help => 'authlinkedin.html',
form => 'simpleInputContainer',
nodes => [
'linkedInAuthnLevel', 'linkedInClientID',
'linkedInClientSecret', 'linkedInFields',
'linkedInUserField', 'linkedInScope'
'linkedInAuthnLevel',
'linkedInClientID',
'linkedInClientSecret',
'linkedInFields',
'linkedInUserField',
'linkedInScope'
]
},
{
@ -312,8 +331,10 @@ sub tree {
help => 'authgithub.html',
form => 'simpleInputContainer',
nodes => [
'githubAuthnLevel', 'githubClientID',
'githubClientSecret', 'githubUserField',
'githubAuthnLevel',
'githubClientID',
'githubClientSecret',
'githubUserField',
'githubScope'
]
},
@ -332,8 +353,10 @@ sub tree {
title => 'openidParams',
help => 'authopenid.html',
nodes => [
'openIdAuthnLevel', 'openIdExportedVars',
'openIdSecret', 'openIdIDPList'
'openIdAuthnLevel',
'openIdExportedVars',
'openIdSecret',
'openIdIDPList'
]
},
{
@ -357,8 +380,10 @@ sub tree {
help => 'authproxy.html',
form => 'simpleInputContainer',
nodes => [
'proxyAuthnLevel', 'proxyAuthService',
'proxySessionService', 'remoteCookieName',
'proxyAuthnLevel',
'proxyAuthService',
'proxySessionService',
'remoteCookieName',
'proxyUseSoap'
]
},
@ -373,7 +398,8 @@ sub tree {
help => 'authradius.html',
form => 'simpleInputContainer',
nodes => [
'radiusAuthnLevel', 'radiusSecret',
'radiusAuthnLevel',
'radiusSecret',
'radiusServer'
]
},
@ -382,8 +408,10 @@ sub tree {
help => 'authrest.html',
form => 'simpleInputContainer',
nodes => [
'restAuthnLevel', 'restAuthUrl',
'restUserDBUrl', 'restPwdConfirmUrl',
'restAuthnLevel',
'restAuthUrl',
'restUserDBUrl',
'restPwdConfirmUrl',
'restPwdModifyUrl'
]
},
@ -401,9 +429,12 @@ sub tree {
title => 'slaveParams',
help => 'authslave.html',
nodes => [
'slaveAuthnLevel', 'slaveUserHeader',
'slaveMasterIP', 'slaveHeaderName',
'slaveHeaderContent', 'slaveDisplayLogo',
'slaveAuthnLevel',
'slaveUserHeader',
'slaveMasterIP',
'slaveHeaderName',
'slaveHeaderContent',
'slaveDisplayLogo',
'slaveExportedVars',
]
},
@ -411,8 +442,10 @@ sub tree {
title => 'sslParams',
help => 'authssl.html',
nodes => [
'SSLAuthnLevel', 'SSLVar',
'SSLVarIf', 'sslByAjax',
'SSLAuthnLevel',
'SSLVar',
'SSLVarIf',
'sslByAjax',
'sslHost',
]
},
@ -421,8 +454,10 @@ sub tree {
help => 'authtwitter.html',
form => 'simpleInputContainer',
nodes => [
'twitterAuthnLevel', 'twitterKey',
'twitterSecret', 'twitterAppName',
'twitterAuthnLevel',
'twitterKey',
'twitterSecret',
'twitterAppName',
'twitterUserField'
]
},
@ -430,7 +465,8 @@ sub tree {
title => 'webidParams',
help => 'authwebid.html',
nodes => [
'webIDAuthnLevel', 'webIDExportedVars',
'webIDAuthnLevel',
'webIDExportedVars',
'webIDWhitelist'
]
},
@ -438,9 +474,12 @@ sub tree {
title => 'customParams',
help => 'authcustom.html',
nodes => [
'customAuth', 'customUserDB',
'customPassword', 'customRegister',
'customResetCertByMail', 'customAddParams',
'customAuth',
'customUserDB',
'customPassword',
'customRegister',
'customResetCertByMail',
'customAddParams',
]
},
],
@ -454,7 +493,8 @@ sub tree {
help => 'idpsaml.html',
form => 'simpleInputContainer',
nodes => [
'issuerDBSAMLActivation', 'issuerDBSAMLPath',
'issuerDBSAMLActivation',
'issuerDBSAMLPath',
'issuerDBSAMLRule'
]
},
@ -463,7 +503,8 @@ sub tree {
help => 'idpcas.html#enabling-cas',
form => 'simpleInputContainer',
nodes => [
'issuerDBCASActivation', 'issuerDBCASPath',
'issuerDBCASActivation',
'issuerDBCASPath',
'issuerDBCASRule',
]
},
@ -539,9 +580,12 @@ sub tree {
help => 'ssocookie.html',
form => 'simpleInputContainer',
nodes => [
'cookieName', '*domain',
'cda', 'securedCookie',
'httpOnly', 'cookieExpiration',
'cookieName',
'*domain',
'cda',
'securedCookie',
'httpOnly',
'cookieExpiration',
'sameSite',
]
},
@ -568,8 +612,10 @@ sub tree {
title => 'multipleSessions',
form => 'simpleInputContainer',
nodes => [
'singleSession', 'singleIP',
'singleUserByIP', 'notifyDeleted',
'singleSession',
'singleIP',
'singleUserByIP',
'notifyDeleted',
'notifyOther'
]
},
@ -601,11 +647,16 @@ sub tree {
help => 'portalservers.html',
form => 'simpleInputContainer',
nodes => [
'wsdlServer', 'restExportSecretKeys',
'restClockTolerance', 'restSessionServer',
'restConfigServer', 'restAuthServer',
'restPasswordServer', 'soapSessionServer',
'soapConfigServer', 'exportedAttr',
'wsdlServer',
'restExportSecretKeys',
'restClockTolerance',
'restSessionServer',
'restConfigServer',
'restAuthServer',
'restPasswordServer',
'soapSessionServer',
'soapConfigServer',
'exportedAttr',
]
},
{

2
lemonldap-ng-manager/site/htdocs/static/languages/ar.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"كلمة المرور",
"passwordDB":"وحدة كلمة المرور",
"passwordManagement":"إدارة كلمة المرور",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize":"Minimal size",
"passwordPolicyMinLower":"Minimal lower characters",
"passwordPolicyMinUpper":"Minimal upper characters",

2
lemonldap-ng-manager/site/htdocs/static/languages/de.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Password",
"passwordDB":"Password module",
"passwordManagement":"Password management",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize":"Minimal size",
"passwordPolicyMinLower":"Minimal lower characters",
"passwordPolicyMinUpper":"Minimal upper characters",

2
lemonldap-ng-manager/site/htdocs/static/languages/en.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Password",
"passwordDB":"Password module",
"passwordManagement":"Password management",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize": "Minimal size",
"passwordPolicyMinLower": "Minimal lower characters",
"passwordPolicyMinUpper": "Minimal upper characters",

2
lemonldap-ng-manager/site/htdocs/static/languages/fr.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Mot-de-passe",
"passwordDB":"Module de mot de passe",
"passwordManagement":"Gestion des mots de passe",
"passwordPolicy":"Politique des mots de passe",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize": "Taille minimale",
"passwordPolicyMinLower": "Minimum de minuscules",
"passwordPolicyMinUpper": "Minimum de majuscules",

2
lemonldap-ng-manager/site/htdocs/static/languages/it.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Password",
"passwordDB":"Modulo password",
"passwordManagement":"Gestione password",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize":"Minimal size",
"passwordPolicyMinLower":"Minimal lower characters",
"passwordPolicyMinUpper":"Minimal upper characters",

2
lemonldap-ng-manager/site/htdocs/static/languages/pl.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Hasło",
"passwordDB":"Moduł hasła",
"passwordManagement":"Zarządzanie hasłami",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize":"Minimalny rozmiar",
"passwordPolicyMinLower":"Minimalna liczba małych liter",
"passwordPolicyMinUpper":"Minimalna liczba dużych liter",

2
lemonldap-ng-manager/site/htdocs/static/languages/tr.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Parola",
"passwordDB":"Parola modülü",
"passwordManagement":"Parola yönetimi",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize":"Minimum parola uzunluğu",
"passwordPolicyMinLower":"Minimum küçük harf karakter sayısı",
"passwordPolicyMinUpper":"Minimum büyük harf karakter sayısı",

2
lemonldap-ng-manager/site/htdocs/static/languages/vi.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Mật khẩu",
"passwordDB":"Mô-đun mật khẩu",
"passwordManagement":"Quản lý mật khẩu",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize":"Minimal size",
"passwordPolicyMinLower":"Minimal lower characters",
"passwordPolicyMinUpper":"Minimal upper characters",

2
lemonldap-ng-manager/site/htdocs/static/languages/zh.json vendored
Unescape View File

@ -695,6 +695,8 @@
"password":"Password",
"passwordDB":"Password module",
"passwordManagement":"Password management",
"passwordPolicy":"Password policy",
"passwordPolicyActivation":"Activation",
"passwordPolicyMinSize":"Minimal size",
"passwordPolicyMinLower":"Minimal lower characters",
"passwordPolicyMinUpper":"Minimal upper characters",

2
lemonldap-ng-manager/site/htdocs/static/reverseTree.json vendored
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-manager/site/htdocs/static/struct.json vendored
View File

File diff suppressed because one or more lines are too long

2
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Password/Base.pm
Unescape View File

@ -53,7 +53,7 @@ sub _modifyPassword {
my $pwdPolicyRule = $self->p->HANDLER->buildSub(
$self->p->HANDLER->substitute(
$self->conf->{passwordPolicy}
$self->conf->{passwordPolicyActivation}
)
);
unless ($pwdPolicyRule) {

Write Preview
Loading…
Cancel
Save