Skip to content

Commit c214592

Browse files
authored
Merge pull request hestiacp#1247 from hestiacp/fix-2020-10-password_error_message
Issues with "Old" hestia translation string format
2 parents 49ed11c + ac9fd92 commit c214592

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

web/add/mail/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123

124124
// Check password length
125125
if (empty($_SESSION['error_msg']) && !empty($_POST['v_fwd_only']) ) {
126-
if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = __('Password does not match the minimum requirements');}
126+
if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = _('Password does not match the minimum requirements');}
127127
}
128128

129129
// Protect input

web/edit/db/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
// Change database password
6565
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
6666
if (!validate_password($_POST['v_password'])) {
67-
$_SESSION['error_msg'] = __('Password does not match the minimum requirements');
67+
$_SESSION['error_msg'] = _('Password does not match the minimum requirements');
6868
}else{
6969
$v_password = tempnam("/tmp","vst");
7070
$fp = fopen($v_password, "w");

web/edit/mail/index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
// Change password
400400
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
401401
if (!validate_password($_POST['v_password'])) {
402-
$_SESSION['error_msg'] = __('Password does not match the minimum requirements');
402+
$_SESSION['error_msg'] = _('Password does not match the minimum requirements');
403403
}else{
404404
$v_password = tempnam("/tmp","vst");
405405
$fp = fopen($v_password, "w");

web/edit/user/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
if ((!empty($_POST['v_password'])) && (empty($_SESSION['error_msg']))) {
102102
// Check password length
103103
$pw_len = strlen($_POST['v_password']);
104-
if (!validate_password($_POST['v_password'])) {
105-
$_SESSION['error_msg'] = __('Password does not match the minimum requirements');
104+
if (!validate_password($_POST['v_password'])){
105+
$_SESSION['error_msg'] = _('Password does not match the minimum requirements');
106106
}
107107
if (empty($_SESSION['error_msg'])) {
108108
$v_password = tempnam("/tmp","vst");

0 commit comments

Comments
 (0)