Commit 0042a928 authored by Xavier Guimard's avatar Xavier Guimard

Merge branch 'v2.0'

parents fb8ec238 774137e5
...@@ -41,18 +41,6 @@ for ( my $i = 0; $i < @test; $i++ ) { ...@@ -41,18 +41,6 @@ for ( my $i = 0; $i < @test; $i++ ) {
ok( $h->store( $test[$i] ) == 1, "Test $i is stored" ) ok( $h->store( $test[$i] ) == 1, "Test $i is stored" )
or print STDERR "$Lemonldap::NG::Common::Conf::msg $!"; or print STDERR "$Lemonldap::NG::Common::Conf::msg $!";
$count++; $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; my $cfg;
ok( $cfg = $h->load(1), "Test $i can be read" ) ok( $cfg = $h->load(1), "Test $i can be read" )
or print STDERR $Lemonldap::NG::Common::Conf::msg; or print STDERR $Lemonldap::NG::Common::Conf::msg;
......
...@@ -571,9 +571,8 @@ sub tree { ...@@ -571,9 +571,8 @@ sub tree {
form => 'simpleInputContainer', form => 'simpleInputContainer',
nodes => [ nodes => [
'mailPwdRstUrl', 'mailPwdRstUrl',
'randomPasswordRegexp',
'mailTimeout', 'mailTimeout',
'randomPasswordRegexp',
] ]
} }
] ]
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"mailSessionKey":"مفتاح الجلسة الذي يحتوي على عنوان البريد الإلكتروني", "mailSessionKey":"مفتاح الجلسة الذي يحتوي على عنوان البريد الإلكتروني",
"mailPwdRstSubject":"نجاح عنوان البريد", "mailPwdRstSubject":"نجاح عنوان البريد",
"mailTimeout":"عدم تطابق كلمت المرور", "mailTimeout":"عدم تطابق كلمت المرور",
"mailPwdRstUrl":"Password reset page URL", "mailPwdRstUrl":"Page URL",
"maintenance":"وضع الصيانة", "maintenance":"وضع الصيانة",
"malformedValue":"قيمة سيئة التصميم", "malformedValue":"قيمة سيئة التصميم",
"managerDn":"حساب", "managerDn":"حساب",
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"mailSessionKey":"Session key containing mail address", "mailSessionKey":"Session key containing mail address",
"mailPwdRstSubject":"Success mail subject", "mailPwdRstSubject":"Success mail subject",
"mailTimeout":"Validity time of a password reset request", "mailTimeout":"Validity time of a password reset request",
"mailPwdRstUrl":"Password reset page URL", "mailPwdRstUrl":"Page URL",
"maintenance":"Maintenance mode", "maintenance":"Maintenance mode",
"malformedValue":"Malformed value", "malformedValue":"Malformed value",
"managerDn":"Account", "managerDn":"Account",
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"mailSessionKey":"Session key containing mail address", "mailSessionKey":"Session key containing mail address",
"mailPwdRstSubject":"Success mail subject", "mailPwdRstSubject":"Success mail subject",
"mailTimeout":"Validity time of a password reset request", "mailTimeout":"Validity time of a password reset request",
"mailPwdRstUrl":"Password reset page URL", "mailPwdRstUrl":"Page URL",
"maintenance":"Maintenance mode", "maintenance":"Maintenance mode",
"malformedValue":"Malformed value", "malformedValue":"Malformed value",
"managerDn":"Account", "managerDn":"Account",
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"mailSessionKey":"Clef de session contenant l'adresse email", "mailSessionKey":"Clef de session contenant l'adresse email",
"mailPwdRstSubject":"Sujet du message de succès", "mailPwdRstSubject":"Sujet du message de succès",
"mailTimeout":"Durée de validité d'une demande de réinitialisation", "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", "maintenance":"Mode maintenance",
"malformedValue":"Valeur mal formée", "malformedValue":"Valeur mal formée",
"managerDn":"Compte de connexion LDAP", "managerDn":"Compte de connexion LDAP",
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"mailSessionKey":"Chiave di sessione contenente l'indirizzo di posta", "mailSessionKey":"Chiave di sessione contenente l'indirizzo di posta",
"mailPwdRstSubject":"Successo del soggetto della mail", "mailPwdRstSubject":"Successo del soggetto della mail",
"mailTimeout":"Tempo di validità di una richiesta di ripristino della password", "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", "maintenance":"Modalità di manutenzione",
"malformedValue":"Valore malformato", "malformedValue":"Valore malformato",
"managerDn":"Account", "managerDn":"Account",
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"mailSessionKey":"Khóa phiên chứa địa chỉ thư", "mailSessionKey":"Khóa phiên chứa địa chỉ thư",
"mailPwdRstSubject":"Chủ đề thư thành công", "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", "mailTimeout":"Thời hạn hợp lệ của yêu cầu đặt lại mật khẩu",
"mailPwdRstUrl":"Password reset page URL", "mailPwdRstUrl":"Page URL",
"maintenance":"Chế độ bảo trì", "maintenance":"Chế độ bảo trì",
"malformedValue":"Giá trị không hợp lệ", "malformedValue":"Giá trị không hợp lệ",
"managerDn":"Tài khoản", "managerDn":"Tài khoản",
......
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
"mailSessionKey":"Session key containing mail address", "mailSessionKey":"Session key containing mail address",
"mailPwdRstSubject":"Success mail subject", "mailPwdRstSubject":"Success mail subject",
"mailTimeout":"Validity time of a password reset request", "mailTimeout":"Validity time of a password reset request",
"mailPwdRstUrl":"Password reset page URL", "mailPwdRstUrl":"Page URL",
"maintenance":"Maintenance mode", "maintenance":"Maintenance mode",
"malformedValue":"Malformed value", "malformedValue":"Malformed value",
"managerDn":"账户", "managerDn":"账户",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-eye"></i> </span> <span class="input-group-text"><i class="fa fa-eye"></i> </span>
</div> </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> </div>
</TMPL_IF> </TMPL_IF>
<input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" /> <input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-eye"></i> </span> <span class="input-group-text"><i class="fa fa-eye"></i> </span>
</div> </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> </div>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN"> <TMPL_IF NAME="TOKEN">
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-eye"></i> </span> <span class="input-group-text"><i class="fa fa-eye"></i> </span>
</div> </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> </div>
</TMPL_IF> </TMPL_IF>
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-eye"></i> </span> <span class="input-group-text"><i class="fa fa-eye"></i> </span>
</div> </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> </div>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN"> <TMPL_IF NAME="TOKEN">
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-eye"></i> </span> <span class="input-group-text"><i class="fa fa-eye"></i> </span>
</div> </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> </div>
</TMPL_IF> </TMPL_IF>
<TMPL_IF NAME="TOKEN"> <TMPL_IF NAME="TOKEN">
......
Markdown is supported
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