Skip to content

Commit 4f8673d

Browse files
author
Till Brehm
committed
Merge branch 'fix-4030' into 'stable-3.1'
 Prevent password managers to overwrite passwords (fixes #4030) Prevent password managers to overwrite passwords in reseller / client and mailbox (fixed #4030) See merge request !380
2 parents 6c9798e + 8685ef0 commit 4f8673d

27 files changed

+42
-12
lines changed

‎interface/web/client/lib/lang/en_client.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ $wb["contact_firstname_txt"] = 'Contact firstname';
1919
$wb["contact_name_txt"] = 'Contact name';
2020
$wb["username_txt"] = 'Username';
2121
$wb["password_txt"] = 'Password';
22+
$wb['password_click_to_set_txt'] = 'Click to set';
2223
$wb["password_strength_txt"] = 'Password strength';
2324
$wb["language_txt"] = 'Language';
2425
$wb["usertheme_txt"] = 'Theme';

‎interface/web/client/lib/lang/en_reseller.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ $wb["contact_firstname_txt"] = 'Contact firstname';
1919
$wb["contact_name_txt"] = 'Contact name';
2020
$wb["username_txt"] = 'Username';
2121
$wb["password_txt"] = 'Password';
22+
$wb['password_click_to_set_txt'] = 'Click to set';
2223
$wb["password_strength_txt"] = 'Password strength';
2324
$wb["language_txt"] = 'Language';
2425
$wb["usertheme_txt"] = 'Theme';

‎interface/web/client/lib/lang/nl_client.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ $wb['contact_firstname_txt'] = 'Contact firstname';
1818
$wb['contact_name_txt'] = 'Contactpersoon';
1919
$wb['username_txt'] = 'Gebruikersnaam';
2020
$wb['password_txt'] = 'Wachtwoord';
21+
$wb['password_click_to_set_txt'] = 'Klik om in te stellen';
2122
$wb['password_strength_txt'] = 'Wachtwoord sterkte';
2223
$wb['language_txt'] = 'Taal';
2324
$wb['usertheme_txt'] = 'Thema';

‎interface/web/client/lib/lang/nl_reseller.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ $wb['contact_firstname_txt'] = 'Contact firstname';
1717
$wb['contact_name_txt'] = 'Contactpersoon';
1818
$wb['username_txt'] = 'Gebruikersnaam';
1919
$wb['password_txt'] = 'Wachtwoord';
20+
$wb['password_click_to_set_txt'] = 'Klik om in te stellen';
2021
$wb['password_strength_txt'] = 'Wachtwoord sterkte';
2122
$wb['language_txt'] = 'Taal';
2223
$wb['usertheme_txt'] = 'Thema';

‎interface/web/client/templates/client_edit_address.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3131
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
3232
<div class="col-sm-9">
3333
<div class="input-group">
34-
<input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
34+
<input type="password" name="password" id="password" value="{tmpl_var name='password'}" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
3535
<span class="input-group-btn">
3636
<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
3737
</span>
@@ -47,7 +47,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4747
</div>
4848
<div class="form-group">
4949
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
50-
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
50+
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
5151
<div class="form-group">
5252
<div class="col-sm-offset-3 col-sm-9">
5353
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>

‎interface/web/client/templates/reseller_edit_address.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
3131
<label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
3232
<div class="col-sm-9">
3333
<div class="input-group">
34-
<input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
34+
<input type="password" name="password" id="password" value="{tmpl_var name='password'}" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
3535
<span class="input-group-btn">
3636
<button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
3737
</span>
@@ -47,7 +47,7 @@ <h1><tmpl_var name="list_head_txt"></h1>
4747
</div>
4848
<div class="form-group">
4949
<label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
50-
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
50+
<div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" title="{tmpl_var name='password_click_to_set_txt'}" class="form-control" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" /></div></div>
5151
<div class="form-group">
5252
<div class="col-sm-offset-3 col-sm-9">
5353
<div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>

‎interface/web/mail/lib/lang/en_mail_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ $wb["quota_error_isint"] = 'Mailbox size must be a number.';
2121
$wb["quota_txt"] = 'Quota (0 for unlimited)';
2222
$wb["server_id_txt"] = 'Aerver_id';
2323
$wb["password_txt"] = 'Password';
24+
$wb['password_click_to_set_txt'] = 'Click to set';
2425
$wb["maildir_txt"] = 'Maildir';
2526
$wb["postfix_txt"] = 'Enable receiving';
2627
$wb['greylisting_txt'] = 'Enable greylisting';

‎interface/web/mail/lib/lang/fr_mail_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,5 @@ $wb['daily_backup_txt'] = 'Daily';
6161
$wb['weekly_backup_txt'] = 'Weekly';
6262
$wb['monthly_backup_txt'] = 'Monthly';
6363
$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
64+
$wb['password_click_to_set_txt'] = 'Click to set';
6465
?>

‎interface/web/mail/lib/lang/hr_mail_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ $wb['quota_error_isint'] = 'Mailbox size must be a number.';
1717
$wb['quota_txt'] = 'Kvota';
1818
$wb['server_id_txt'] = 'Aerver_id';
1919
$wb['password_txt'] = 'Šifra';
20+
$wb['password_click_to_set_txt'] = 'Click to set';
2021
$wb['maildir_txt'] = 'Maildir';
2122
$wb['postfix_txt'] = 'Enable Receiving';
2223
$wb['greylisting_txt'] = 'Enable greylisting';

‎interface/web/mail/lib/lang/hu_mail_user.lng‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ $wb['quota_error_isint'] = 'Mailbox méret mező csak szákot tartalmazhat';
1313
$wb['quota_txt'] = 'Korlát MB-ban kifejezve';
1414
$wb['server_id_txt'] = 'szerver_azonosító';
1515
$wb['password_txt'] = 'Jelszó';
16+
$wb['password_click_to_set_txt'] = 'Click to set';
1617
$wb['maildir_txt'] = 'levelezőláda';
1718
$wb['postfix_txt'] = 'Bejövő engedélyezés';
1819
$wb['greylisting_txt'] = 'Enable greylisting';

0 commit comments

Comments
 (0)