Skip to content

Commit 47ade32

Browse files
very-twivery-twi
committed
Fixed edit empty ftp user domain; Fixed hints updates on data insertion inside inputs; Fixed bug with resetting passwords for FTP user accounts;
1 parent b7724e5 commit 47ade32

File tree

3 files changed

+37
-35
lines changed

3 files changed

+37
-35
lines changed

‎web/edit/web/index.php‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
$v_ftp_users_updated = array();
432432
foreach ($_POST['v_ftp_user'] as $i => $v_ftp_user_data) {
433433
$v_ftp_user_data['v_ftp_user'] = preg_replace("/^".$user."_/i", "", $v_ftp_user_data['v_ftp_user']);
434-
if ($v_ftp_user_data['is_new'] == 1) {
434+
if ($v_ftp_user_data['is_new'] == 1 && !empty($_POST['v_ftp'])) {
435435
if ((!empty($v_ftp_user_data['v_ftp_email'])) && (!filter_var($v_ftp_user_data['v_ftp_email'], FILTER_VALIDATE_EMAIL))) $_SESSION['error_msg'] = __('Please enter valid email address.');
436436
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = 'ftp user';
437437
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = 'ftp user password';
@@ -495,40 +495,42 @@
495495
continue;
496496
}
497497

498-
// Change FTP Account
499-
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user');
500-
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password');
501-
if (!empty($errors[0])) {
502-
foreach ($errors as $i => $error) {
503-
if ( $i == 0 ) {
504-
$error_msg = $error;
505-
} else {
506-
$error_msg = $error_msg.", ".$error;
498+
if (!empty($_POST['v_ftp'])) {
499+
// Change FTP Account
500+
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user');
501+
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password');
502+
if (!empty($errors[0])) {
503+
foreach ($errors as $i => $error) {
504+
if ( $i == 0 ) {
505+
$error_msg = $error;
506+
} else {
507+
$error_msg = $error_msg.", ".$error;
508+
}
507509
}
510+
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
508511
}
509-
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
510-
}
511512

512-
$v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']);
513-
$v_ftp_username = escapeshellarg($v_ftp_username);
514-
$v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password']));
515-
exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_user_data['v_ftp_path'], $output, $return_var);
516-
if ($v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) {
517-
exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_user_data['v_ftp_password'], $output, $return_var);
518-
}
519-
check_return_code($return_var, $output);
520-
unset($output);
513+
$v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']);
514+
$v_ftp_username = escapeshellarg($v_ftp_username);
515+
$v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password']));
516+
exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_user_data['v_ftp_path'], $output, $return_var);
517+
if ($v_ftp_user_data['v_ftp_password'] != "'••••••••'" && $v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) {
518+
exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_user_data['v_ftp_password'], $output, $return_var);
519+
}
520+
check_return_code($return_var, $output);
521+
unset($output);
521522

522-
$v_ftp_password = "••••••••";
523+
$v_ftp_password = "••••••••";
523524

524-
$v_ftp_users_updated[] = array(
525-
'is_new' => 0,
526-
'v_ftp_user' => $v_ftp_username,
527-
'v_ftp_password' => $v_ftp_password,
528-
'v_ftp_path' => $v_ftp_user_data['v_ftp_path'],
529-
'v_ftp_email' => $v_ftp_user_data['v_ftp_email'],
530-
'v_ftp_pre_path' => $v_ftp_user_prepath
531-
);
525+
$v_ftp_users_updated[] = array(
526+
'is_new' => 0,
527+
'v_ftp_user' => $v_ftp_username,
528+
'v_ftp_password' => $v_ftp_password,
529+
'v_ftp_path' => $v_ftp_user_data['v_ftp_path'],
530+
'v_ftp_email' => $v_ftp_user_data['v_ftp_email'],
531+
'v_ftp_pre_path' => $v_ftp_user_prepath
532+
);
533+
}
532534
}
533535
}
534536

‎web/js/pages/add.web.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ App.Listeners.WEB.keypress_ftp_username = function() {
2121
App.Actions.WEB.update_ftp_username_hint(ref, current_val);
2222
}
2323

24-
ref.bind('keypress', function(evt) {
24+
ref.bind('keypress input', function(evt) {
2525
clearTimeout(window.frp_usr_tmt);
2626
window.frp_usr_tmt = setTimeout(function() {
2727
var elm = $(evt.target);
@@ -32,7 +32,7 @@ App.Listeners.WEB.keypress_ftp_username = function() {
3232
}
3333

3434
App.Listeners.WEB.keypress_domain_name = function() {
35-
$('#v_domain').bind('keypress', function(evt) {
35+
$('#v_domain').bind('keypress input', function(evt) {
3636
clearTimeout(window.frp_usr_tmt);
3737
window.frp_usr_tmt = setTimeout(function() {
3838
//var elm = $(evt.target);
@@ -67,7 +67,7 @@ App.Listeners.WEB.keypress_ftp_path = function() {
6767
App.Actions.WEB.update_ftp_path_hint(ref, current_val);
6868
}
6969

70-
ref.bind('keypress', function(evt) {
70+
ref.bind('keypress input', function(evt) {
7171
clearTimeout(window.frp_usr_tmt);
7272
window.frp_usr_tmt = setTimeout(function() {
7373
var elm = $(evt.target);

‎web/js/pages/edit.web.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ App.Listeners.WEB.keypress_ftp_username = function() {
2121
App.Actions.WEB.update_ftp_username_hint(ref, current_val);
2222
}
2323

24-
ref.bind('keypress', function(evt) {
24+
ref.bind('keypress input', function(evt) {
2525
clearTimeout(window.frp_usr_tmt);
2626
window.frp_usr_tmt = setTimeout(function() {
2727
var elm = $(evt.target);
@@ -57,7 +57,7 @@ App.Listeners.WEB.keypress_ftp_path = function() {
5757
App.Actions.WEB.update_ftp_path_hint(ref, current_val);
5858
}
5959

60-
ref.bind('keypress', function(evt) {
60+
ref.bind('keypress input', function(evt) {
6161
clearTimeout(window.frp_usr_tmt);
6262
window.frp_usr_tmt = setTimeout(function() {
6363
var elm = $(evt.target);

0 commit comments

Comments
 (0)