Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Xavier Bachelot
lemonldap-ng
Commits
0042a928
Commit
0042a928
authored
Jan 19, 2019
by
Yadd
Browse files
Merge branch 'v2.0'
parents
fb8ec238
774137e5
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
lemonldap-ng-common/t/02-Common-Conf-File.t
View file @
0042a928
...
...
@@ -41,18 +41,6 @@ for ( my $i = 0; $i < @test; $i++ ) {
ok
(
$h
->
store
(
$test
[
$i
]
)
==
1
,
"
Test
$i
is stored
"
)
or
print
STDERR
"
$Lemonldap
::NG::Common::Conf::msg $!
";
$count
++
;
if
(
-
x
'
/usr/bin/file
'
)
{
eval
{
open
F
,
'
file t/lmConf-1.json |
';
$_
=
join
(
'',
<
F
>
);
close
F
;
## Debian Buster 'file' command returns JSON DATA
ok
(
/(ascii|utf-?8|json\sdata)/si
,
"
File is $1 encoded
"
)
or
print
STDERR
"
Result:
$_
\n
";
$count
++
;
};
}
my
$cfg
;
ok
(
$cfg
=
$h
->
load
(
1
),
"
Test
$i
can be read
"
)
or
print
STDERR
$
Lemonldap::NG::Common::Conf::
msg
;
...
...
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm
View file @
0042a928
...
...
@@ -571,9 +571,8 @@ sub tree {
form
=>
'
simpleInputContainer
',
nodes
=>
[
'
mailPwdRstUrl
',
'
randomPasswordRegexp
',
'
mailTimeout
',
'
randomPasswordRegexp
',
]
}
]
...
...
lemonldap-ng-manager/site/htdocs/static/languages/ar.json
View file @
0042a928
...
...
@@ -393,7 +393,7 @@
"mailSessionKey"
:
"مفتاح الجلسة الذي يحتوي على عنوان البريد الإلكتروني"
,
"mailPwdRstSubject"
:
"نجاح عنوان البريد"
,
"mailTimeout"
:
"عدم تطابق كلمت المرور"
,
"mailPwdRstUrl"
:
"Pa
ssword reset pa
ge URL"
,
"mailPwdRstUrl"
:
"Page URL"
,
"maintenance"
:
"وضع الصيانة"
,
"malformedValue"
:
"قيمة سيئة التصميم"
,
"managerDn"
:
"حساب"
,
...
...
lemonldap-ng-manager/site/htdocs/static/languages/de.json
View file @
0042a928
...
...
@@ -393,7 +393,7 @@
"mailSessionKey"
:
"Session key containing mail address"
,
"mailPwdRstSubject"
:
"Success mail subject"
,
"mailTimeout"
:
"Validity time of a password reset request"
,
"mailPwdRstUrl"
:
"Pa
ssword reset pa
ge URL"
,
"mailPwdRstUrl"
:
"Page URL"
,
"maintenance"
:
"Maintenance mode"
,
"malformedValue"
:
"Malformed value"
,
"managerDn"
:
"Account"
,
...
...
lemonldap-ng-manager/site/htdocs/static/languages/en.json
View file @
0042a928
...
...
@@ -393,7 +393,7 @@
"mailSessionKey"
:
"Session key containing mail address"
,
"mailPwdRstSubject"
:
"Success mail subject"
,
"mailTimeout"
:
"Validity time of a password reset request"
,
"mailPwdRstUrl"
:
"Pa
ssword reset pa
ge URL"
,
"mailPwdRstUrl"
:
"Page URL"
,
"maintenance"
:
"Maintenance mode"
,
"malformedValue"
:
"Malformed value"
,
"managerDn"
:
"Account"
,
...
...
lemonldap-ng-manager/site/htdocs/static/languages/fr.json
View file @
0042a928
...
...
@@ -393,7 +393,7 @@
"mailSessionKey"
:
"Clef de session contenant l'adresse email"
,
"mailPwdRstSubject"
:
"Sujet du message de succès"
,
"mailTimeout"
:
"Durée de validité d'une demande de réinitialisation"
,
"mailPwdRstUrl"
:
"URL de la page
de réinitialisation du mot de passe
"
,
"mailPwdRstUrl"
:
"URL de la page"
,
"maintenance"
:
"Mode maintenance"
,
"malformedValue"
:
"Valeur mal formée"
,
"managerDn"
:
"Compte de connexion LDAP"
,
...
...
lemonldap-ng-manager/site/htdocs/static/languages/it.json
View file @
0042a928
...
...
@@ -393,7 +393,7 @@
"mailSessionKey"
:
"Chiave di sessione contenente l'indirizzo di posta"
,
"mailPwdRstSubject"
:
"Successo del soggetto della mail"
,
"mailTimeout"
:
"Tempo di validità di una richiesta di ripristino della password"
,
"mailPwdRstUrl"
:
"URL della pagina
di ripristino della password
"
,
"mailPwdRstUrl"
:
"URL della pagina"
,
"maintenance"
:
"Modalità di manutenzione"
,
"malformedValue"
:
"Valore malformato"
,
"managerDn"
:
"Account"
,
...
...
lemonldap-ng-manager/site/htdocs/static/languages/vi.json
View file @
0042a928
...
...
@@ -393,7 +393,7 @@
"mailSessionKey"
:
"Khóa phiên chứa địa chỉ thư"
,
"mailPwdRstSubject"
:
"Chủ đề thư thành công"
,
"mailTimeout"
:
"Thời hạn hợp lệ của yêu cầu đặt lại mật khẩu"
,
"mailPwdRstUrl"
:
"Pa
ssword reset pa
ge URL"
,
"mailPwdRstUrl"
:
"Page URL"
,
"maintenance"
:
"Chế độ bảo trì"
,
"malformedValue"
:
"Giá trị không hợp lệ"
,
"managerDn"
:
"Tài khoản"
,
...
...
lemonldap-ng-manager/site/htdocs/static/languages/zh.json
View file @
0042a928
...
...
@@ -393,7 +393,7 @@
"mailSessionKey"
:
"Session key containing mail address"
,
"mailPwdRstSubject"
:
"Success mail subject"
,
"mailTimeout"
:
"Validity time of a password reset request"
,
"mailPwdRstUrl"
:
"Pa
ssword reset pa
ge URL"
,
"mailPwdRstUrl"
:
"Page URL"
,
"maintenance"
:
"Maintenance mode"
,
"malformedValue"
:
"Malformed value"
,
"managerDn"
:
"账户"
,
...
...
lemonldap-ng-manager/site/htdocs/static/struct.json
View file @
0042a928
This diff is collapsed.
Click to expand it.
lemonldap-ng-portal/site/templates/bootstrap/gpgform.tpl
View file @
0042a928
...
...
@@ -23,7 +23,7 @@
<div
class=
"input-group-prepend"
>
<span
class=
"input-group-text"
><i
class=
"fa fa-eye"
></i>
</span>
</div>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
aria-required=
"true"
/>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
aria-required=
"true"
autocomplete=
"off"
/>
</div>
</TMPL_IF>
<input
type=
"hidden"
name=
"token"
value=
"<TMPL_VAR NAME="
TOKEN
"
>
" />
...
...
lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
View file @
0042a928
...
...
@@ -36,7 +36,7 @@
<div
class=
"input-group-prepend"
>
<span
class=
"input-group-text"
><i
class=
"fa fa-eye"
></i>
</span>
</div>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
/>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
autocomplete=
"off"
/>
</div>
</TMPL_IF>
<TMPL_IF
NAME=
"TOKEN"
>
...
...
@@ -87,7 +87,7 @@
<div
class=
"input-group-prepend"
>
<span
class=
"input-group-text"
><i
class=
"fa fa-eye"
></i>
</span>
</div>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
/>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
autocomplete=
"off"
/>
</div>
</TMPL_IF>
...
...
lemonldap-ng-portal/site/templates/bootstrap/register.tpl
View file @
0042a928
...
...
@@ -48,7 +48,7 @@
<div
class=
"input-group-prepend"
>
<span
class=
"input-group-text"
><i
class=
"fa fa-eye"
></i>
</span>
</div>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
placeholder=
"Captcha"
required
aria-required=
"true"
/>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
placeholder=
"Captcha"
required
aria-required=
"true"
autocomplete=
"off"
/>
</div>
</TMPL_IF>
<TMPL_IF
NAME=
"TOKEN"
>
...
...
lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
View file @
0042a928
...
...
@@ -21,7 +21,7 @@
<div
class=
"input-group-prepend"
>
<span
class=
"input-group-text"
><i
class=
"fa fa-eye"
></i>
</span>
</div>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
aria-required=
"true"
/>
<input
type=
"text"
name=
"captcha"
size=
"<TMPL_VAR NAME=CAPTCHA_SIZE>"
class=
"form-control"
trplaceholder=
"captcha"
required
aria-required=
"true"
autocomplete=
"off"
/>
</div>
</TMPL_IF>
<TMPL_IF
NAME=
"TOKEN"
>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment