github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 05:44:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:serghey-rodin/vesta

Browse source
This commit is contained in:
Serghey Rodin 2014-09-17 00:53:35 +03:00
commit d1ad91d8ef
4 changed files with 47 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

3
web/add/web/index.php
View file

@ -262,7 +262,8 @@ if (!empty($_POST['ok'])) {
$v_ftp_password = escapeshellarg($v_ftp_user_data['v_ftp_password']); $v_ftp_password = escapeshellarg($v_ftp_user_data['v_ftp_password']);
if ($domain_added) { if ($domain_added) {
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); $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
check_return_code($return_var,$output); check_return_code($return_var,$output);
unset($output); unset($output);
if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) { if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) {

15
web/edit/web/index.php
View file

@ -430,8 +430,11 @@ if (!empty($_POST['save'])) {
if (!empty($_POST['v_ftp_user'])) { if (!empty($_POST['v_ftp_user'])) {
$v_ftp_users_updated = array(); $v_ftp_users_updated = array();
foreach ($_POST['v_ftp_user'] as $i => $v_ftp_user_data) { foreach ($_POST['v_ftp_user'] as $i => $v_ftp_user_data) {
if (empty($v_ftp_user_data['v_ftp_user']) && empty($v_ftp_user_data['v_ftp_password'])) {
continue;
}
$v_ftp_user_data['v_ftp_user'] = preg_replace("/^".$user."_/i", "", $v_ftp_user_data['v_ftp_user']); $v_ftp_user_data['v_ftp_user'] = preg_replace("/^".$user."_/i", "", $v_ftp_user_data['v_ftp_user']);
if ($v_ftp_user_data['is_new'] == 1) { if ($v_ftp_user_data['is_new'] == 1 && !empty($_POST['v_ftp'])) {
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.'); 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.');
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = 'ftp user'; if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = 'ftp user';
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = 'ftp user password'; if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = 'ftp user password';
@ -450,8 +453,9 @@ if (!empty($_POST['save'])) {
$v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user']; $v_ftp_username_full = $user . '_' . $v_ftp_user_data['v_ftp_user'];
$v_ftp_user = escapeshellarg($v_ftp_username); $v_ftp_user = escapeshellarg($v_ftp_username);
$v_ftp_password = escapeshellarg($v_ftp_user_data['v_ftp_password']); $v_ftp_password = escapeshellarg($v_ftp_user_data['v_ftp_password']);
$v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
if (empty($_SESSION['error_msg'])) { if (empty($_SESSION['error_msg'])) {
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); exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_password . " " . $v_ftp_path, $output, $return_var);
check_return_code($return_var,$output); check_return_code($return_var,$output);
if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) { if ((!empty($v_ftp_user_data['v_ftp_email'])) && (empty($_SESSION['error_msg']))) {
$to = $v_ftp_user_data['v_ftp_email']; $to = $v_ftp_user_data['v_ftp_email'];
@ -495,6 +499,7 @@ if (!empty($_POST['save'])) {
continue; continue;
} }
if (!empty($_POST['v_ftp'])) {
// Change FTP Account // Change FTP Account
if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user'); if (empty($v_ftp_user_data['v_ftp_user'])) $errors[] = __('ftp user');
if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password'); if (empty($v_ftp_user_data['v_ftp_password'])) $errors[] = __('ftp user password');
@ -512,8 +517,9 @@ if (!empty($_POST['save'])) {
$v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']); $v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']);
$v_ftp_username = escapeshellarg($v_ftp_username); $v_ftp_username = escapeshellarg($v_ftp_username);
$v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password'])); $v_ftp_user_data['v_ftp_password'] = escapeshellarg(trim($v_ftp_user_data['v_ftp_password']));
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); $v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
if ($v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) { exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var);
if ($v_ftp_user_data['v_ftp_password'] != "'••••••••'" && $v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) {
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); 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);
} }
check_return_code($return_var, $output); check_return_code($return_var, $output);
@ -531,6 +537,7 @@ if (!empty($_POST['save'])) {
); );
} }
} }
}
// Restart web server // Restart web server
if (!empty($restart_web) && (empty($_SESSION['error_msg']))) { if (!empty($restart_web) && (empty($_SESSION['error_msg']))) {

6
web/js/pages/add.web.js
View file

@ -21,7 +21,7 @@ App.Listeners.WEB.keypress_ftp_username = function() {
App.Actions.WEB.update_ftp_username_hint(ref, current_val); App.Actions.WEB.update_ftp_username_hint(ref, current_val);
} }
ref.bind('keypress', function(evt) { ref.bind('keypress input', function(evt) {
clearTimeout(window.frp_usr_tmt); clearTimeout(window.frp_usr_tmt);
window.frp_usr_tmt = setTimeout(function() { window.frp_usr_tmt = setTimeout(function() {
var elm = $(evt.target); var elm = $(evt.target);
@ -32,7 +32,7 @@ App.Listeners.WEB.keypress_ftp_username = function() {
} }
App.Listeners.WEB.keypress_domain_name = function() { App.Listeners.WEB.keypress_domain_name = function() {
$('#v_domain').bind('keypress', function(evt) { $('#v_domain').bind('keypress input', function(evt) {
clearTimeout(window.frp_usr_tmt); clearTimeout(window.frp_usr_tmt);
window.frp_usr_tmt = setTimeout(function() { window.frp_usr_tmt = setTimeout(function() {
//var elm = $(evt.target); //var elm = $(evt.target);
@ -67,7 +67,7 @@ App.Listeners.WEB.keypress_ftp_path = function() {
App.Actions.WEB.update_ftp_path_hint(ref, current_val); App.Actions.WEB.update_ftp_path_hint(ref, current_val);
} }
ref.bind('keypress', function(evt) { ref.bind('keypress input', function(evt) {
clearTimeout(window.frp_usr_tmt); clearTimeout(window.frp_usr_tmt);
window.frp_usr_tmt = setTimeout(function() { window.frp_usr_tmt = setTimeout(function() {
var elm = $(evt.target); var elm = $(evt.target);

4
web/js/pages/edit.web.js
View file

@ -21,7 +21,7 @@ App.Listeners.WEB.keypress_ftp_username = function() {
App.Actions.WEB.update_ftp_username_hint(ref, current_val); App.Actions.WEB.update_ftp_username_hint(ref, current_val);
} }
ref.bind('keypress', function(evt) { ref.bind('keypress input', function(evt) {
clearTimeout(window.frp_usr_tmt); clearTimeout(window.frp_usr_tmt);
window.frp_usr_tmt = setTimeout(function() { window.frp_usr_tmt = setTimeout(function() {
var elm = $(evt.target); var elm = $(evt.target);
@ -57,7 +57,7 @@ App.Listeners.WEB.keypress_ftp_path = function() {
App.Actions.WEB.update_ftp_path_hint(ref, current_val); App.Actions.WEB.update_ftp_path_hint(ref, current_val);
} }
ref.bind('keypress', function(evt) { ref.bind('keypress input', function(evt) {
clearTimeout(window.frp_usr_tmt); clearTimeout(window.frp_usr_tmt);
window.frp_usr_tmt = setTimeout(function() { window.frp_usr_tmt = setTimeout(function() {
var elm = $(evt.target); var elm = $(evt.target);