|
51 | 51 | $v_proxy_ext = str_replace(',', ', ', $data[$v_domain]['PROXY_EXT']); |
52 | 52 | $v_stats = $data[$v_domain]['STATS']; |
53 | 53 | $v_stats_user = $data[$v_domain]['STATS_USER']; |
54 | | -if (!empty($v_stats_user)) $v_stats_password = "••••••••"; |
| 54 | +if (!empty($v_stats_user)) $v_stats_password = ""; |
55 | 55 | $v_ftp_user = $data[$v_domain]['FTP_USER']; |
56 | | -if (!empty($v_ftp_user)) $v_ftp_password = "••••••••"; |
| 56 | +$v_ftp_path = $data[$v_domain]['FTP_PATH']; |
| 57 | +if (!empty($v_ftp_user)) $v_ftp_password = ""; |
57 | 58 | $v_ftp_user_prepath = $data[$v_domain]['DOCUMENT_ROOT']; |
58 | 59 | $v_ftp_user_prepath = str_replace('/public_html', '', $v_ftp_user_prepath, $occurance = 1); |
59 | 60 | $v_ftp_email = $panel[$user]['CONTACT']; |
|
430 | 431 | // Change web stats user or password |
431 | 432 | if ((empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) { |
432 | 433 | if (empty($_POST['v_stats_user'])) $errors[] = __('stats username'); |
433 | | - if (empty($_POST['v_stats_password'])) $errors[] = __('stats password'); |
434 | 434 | if (!empty($errors[0])) { |
435 | 435 | foreach ($errors as $i => $error) { |
436 | 436 | if ( $i == 0 ) { |
|
450 | 450 | check_return_code($return_var,$output); |
451 | 451 | unset($output); |
452 | 452 | unlink($v_stats_password); |
453 | | - $v_stats_password = "••••••••"; |
| 453 | + $v_stats_password = escapeshellarg($_POST['v_stats_password']); |
454 | 454 | } |
455 | 455 | } |
456 | 456 |
|
457 | 457 | // Add web stats authorization |
458 | 458 | if ((!empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) { |
459 | 459 | if (empty($_POST['v_stats_user'])) $errors[] = __('stats user'); |
460 | | - if (empty($_POST['v_stats_password'])) $errors[] = __('stats password'); |
461 | 460 | if (!empty($errors[0])) { |
462 | 461 | foreach ($errors as $i => $error) { |
463 | 462 | if ( $i == 0 ) { |
|
468 | 467 | } |
469 | 468 | $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); |
470 | 469 | } |
471 | | - if (($v_stats_user != $_POST['v_stats_user']) || ($_POST['v_stats_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) { |
| 470 | + if (($v_stats_user != $_POST['v_stats_user']) || (!empty($_POST['v_stats_password'])) && (empty($_SESSION['error_msg']))) { |
472 | 471 | $v_stats_user = escapeshellarg($_POST['v_stats_user']); |
473 | 472 | $v_stats_password = tempnam("/tmp","vst"); |
474 | 473 | $fp = fopen($v_stats_password, "w"); |
|
478 | 477 | check_return_code($return_var,$output); |
479 | 478 | unset($output); |
480 | 479 | unlink($v_stats_password); |
481 | | - $v_stats_password = "••••••••"; |
| 480 | + $v_stats_password = escapeshellarg($_POST['v_stats_password']); |
482 | 481 | } |
483 | 482 | } |
484 | 483 |
|
485 | | - // Change ftp accounts |
| 484 | + // Update ftp account |
486 | 485 | if (!empty($_POST['v_ftp_user'])) { |
487 | 486 | $v_ftp_users_updated = array(); |
488 | 487 | foreach ($_POST['v_ftp_user'] as $i => $v_ftp_user_data) { |
489 | | - if (empty($v_ftp_user_data['v_ftp_user']) && empty($v_ftp_user_data['v_ftp_password'])) { |
| 488 | + if (empty($v_ftp_user_data['v_ftp_user'])) { |
490 | 489 | continue; |
491 | 490 | } |
| 491 | + |
492 | 492 | $v_ftp_user_data['v_ftp_user'] = preg_replace("/^".$user."_/i", "", $v_ftp_user_data['v_ftp_user']); |
493 | 493 | if ($v_ftp_user_data['is_new'] == 1 && !empty($_POST['v_ftp'])) { |
494 | 494 | 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.'); |
495 | 495 | if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = 'ftp user'; |
496 | | - if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = 'ftp user password'; |
497 | 496 | if (!empty($errors[0])) { |
498 | 497 | foreach ($errors as $i => $error) { |
499 | 498 | if ( $i == 0 ) { |
|
505 | 504 | $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); |
506 | 505 | } |
507 | 506 |
|
| 507 | + // Add ftp account |
508 | 508 | $v_ftp_username = $v_ftp_user_data['v_ftp_user']; |
509 | 509 | $v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user']; |
510 | 510 | $v_ftp_user = escapeshellarg($v_ftp_username); |
|
531 | 531 | } |
532 | 532 |
|
533 | 533 | if ($return_var == 0) { |
534 | | - $v_ftp_password = "••••••••"; |
| 534 | + $v_ftp_password = ""; |
535 | 535 | $v_ftp_user_data['is_new'] = 0; |
536 | 536 | } |
537 | 537 | else { |
|
550 | 550 | continue; |
551 | 551 | } |
552 | 552 |
|
553 | | - |
| 553 | + // Delete FTP account |
554 | 554 | if ($v_ftp_user_data['delete'] == 1) { |
555 | 555 | $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; |
556 | 556 | exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username, $output, $return_var); |
|
561 | 561 | } |
562 | 562 |
|
563 | 563 | if (!empty($_POST['v_ftp'])) { |
564 | | - // Change FTP Account |
565 | 564 | if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user'); |
566 | | - if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password'); |
567 | 565 | if (!empty($errors[0])) { |
568 | 566 | foreach ($errors as $i => $error) { |
569 | 567 | if ( $i == 0 ) { |
|
575 | 573 | $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg); |
576 | 574 | } |
577 | 575 |
|
| 576 | + // Change FTP account path |
578 | 577 | $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']); |
579 | 578 | $v_ftp_username = escapeshellarg($v_ftp_username); |
580 | | - $v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password'])); |
581 | | - $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); |
582 | | - exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var); |
583 | | - if ($v_ftp_user_data['v_ftp_password'] != "'••••••••'" && $v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) { |
| 579 | + //if (!empty($v_ftp_user_data['v_ftp_path'])) { |
| 580 | + $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path'])); |
| 581 | + exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var); |
| 582 | + //} |
| 583 | + |
| 584 | + // Change FTP account password |
| 585 | + if (!empty($v_ftp_user_data['v_ftp_password'])) { |
584 | 586 | $v_ftp_password = tempnam("/tmp","vst"); |
585 | 587 | $fp = fopen($v_ftp_password, "w"); |
586 | 588 | fwrite($fp, $v_ftp_user_data['v_ftp_password']."\n"); |
587 | 589 | fclose($fp); |
588 | | - 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); |
| 590 | + exec (VESTA_CMD."v-change-web-domain-ftp-password ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password, $output, $return_var); |
589 | 591 | unlink($v_ftp_password); |
590 | | - $v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password'])); |
| 592 | + |
591 | 593 | $to = $v_ftp_user_data['v_ftp_email']; |
592 | 594 | $subject = __("FTP login credentials"); |
593 | 595 | $hostname = exec('hostname'); |
|
599 | 601 | check_return_code($return_var, $output); |
600 | 602 | unset($output); |
601 | 603 |
|
602 | | - $v_ftp_password = "••••••••"; |
603 | | - |
604 | 604 | $v_ftp_users_updated[] = array( |
605 | 605 | 'is_new' => 0, |
606 | 606 | 'v_ftp_user' => $v_ftp_username, |
607 | | - 'v_ftp_password' => $v_ftp_password, |
| 607 | + 'v_ftp_password' => $v_ftp_user_data['v_ftp_password'], |
608 | 608 | 'v_ftp_path' => $v_ftp_user_data['v_ftp_path'], |
609 | 609 | 'v_ftp_email' => $v_ftp_user_data['v_ftp_email'], |
610 | 610 | 'v_ftp_pre_path' => $v_ftp_user_prepath |
|
0 commit comments