Skip to content

Commit d1ad91d

Browse files
serghey-rodinserghey-rodin
committed
Merge branch 'master' of github.com:serghey-rodin/vesta
2 parents a587c10 + f3f7185 commit d1ad91d

File tree

4 files changed

+45
-37
lines changed

4 files changed

+45
-37
lines changed

‎web/add/web/index.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,8 @@
262262
$v_ftp_password = escapeshellarg($v_ftp_user_data['v_ftp_password']);
263263

264264
if ($domain_added) {
265-
exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_user_data['v_ftp_path'], $output, $return_var);
265+
$v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
266+
exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
266267
check_return_code($return_var,$output);
267268
unset($output);
268269
if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) {

‎web/edit/web/index.php‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,11 @@
430430
if (!empty($_POST['v_ftp_user'])) {
431431
$v_ftp_users_updated = array();
432432
foreach ($_POST['v_ftp_user'] as $i => $v_ftp_user_data) {
433+
if (empty($v_ftp_user_data['v_ftp_user']) && empty($v_ftp_user_data['v_ftp_password'])) {
434+
continue;
435+
}
433436
$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) {
437+
if ($v_ftp_user_data['is_new'] == 1 && !empty($_POST['v_ftp'])) {
435438
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.');
436439
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = 'ftp user';
437440
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = 'ftp user password';
@@ -450,8 +453,9 @@
450453
$v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user'];
451454
$v_ftp_user = escapeshellarg($v_ftp_username);
452455
$v_ftp_password = escapeshellarg($v_ftp_user_data['v_ftp_password']);
456+
$v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
453457
if (empty($_SESSION['error_msg'])) {
454-
exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_user_data['v_ftp_path'], $output, $return_var);
458+
exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
455459
check_return_code($return_var,$output);
456460
if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) {
457461
$to = $v_ftp_user_data['v_ftp_email'];
@@ -495,40 +499,43 @@
495499
continue;
496500
}
497501

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;
502+
if (!empty($_POST['v_ftp'])) {
503+
// Change FTP Account
504+
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user');
505+
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password');
506+
if (!empty($errors[0])) {
507+
foreach ($errors as $i => $error) {
508+
if ( $i == 0 ) {
509+
$error_msg = $error;
510+
} else {
511+
$error_msg = $error_msg.", ".$error;
512+
}
507513
}
514+
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
508515
}
509-
$_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
510-
}
511516

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);
517+
$v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']);
518+
$v_ftp_username = escapeshellarg($v_ftp_username);
519+
$v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password']));
520+
$v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
521+
exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var);
522+
if ($v_ftp_user_data['v_ftp_password'] != "'••••••••'" && $v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) {
523+
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);
524+
}
525+
check_return_code($return_var, $output);
526+
unset($output);
521527

522-
$v_ftp_password = "••••••••";
528+
$v_ftp_password = "••••••••";
523529

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-
);
530+
$v_ftp_users_updated[] = array(
531+
'is_new' => 0,
532+
'v_ftp_user' => $v_ftp_username,
533+
'v_ftp_password' => $v_ftp_password,
534+
'v_ftp_path' => $v_ftp_user_data['v_ftp_path'],
535+
'v_ftp_email' => $v_ftp_user_data['v_ftp_email'],
536+
'v_ftp_pre_path' => $v_ftp_user_prepath
537+
);
538+
}
532539
}
533540
}
534541

‎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)