From e9be41692c107e6d03acc22b436ea7399026e18b Mon Sep 17 00:00:00 2001 From: Malishev Dmitry Date: Tue, 3 Feb 2015 16:07:58 -0500 Subject: [PATCH] Send email on user changed ftp user password --- web/edit/web/index.php | 7 +++++++ web/js/pages/add.web.js | 8 ++++---- web/js/pages/edit.web.js | 31 +++++++++++++++++++++++++++++-- web/templates/admin/edit_web.html | 9 +++++---- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 4373c59b..54e65aaa 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -551,6 +551,13 @@ if (!empty($_POST['save'])) { 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); + $to = $v_ftp_user_data['v_ftp_email']; + $subject = __("FTP login credentials"); + $hostname = exec('hostname'); + $from = __('MAIL_FROM',$hostname); + $mailtext = __('FTP_ACCOUNT_READY',$_GET['domain'],$user,$v_ftp_username,$v_ftp_user_data['v_ftp_password']); + send_email($to, $subject, $mailtext, $from); + unset($v_ftp_email); } check_return_code($return_var, $output); unset($output); diff --git a/web/js/pages/add.web.js b/web/js/pages/add.web.js index e70482ab..e319e3c1 100644 --- a/web/js/pages/add.web.js +++ b/web/js/pages/add.web.js @@ -84,8 +84,8 @@ App.Actions.WEB.add_ftp_user_form = function() { var index = $('.data-col2 .ftptable').length + 1; ref.find('input').each(function(i, elm) { - var attr_value = $(elm).attr('name').replace('%INDEX%', index); - $(elm).attr('name', attr_value); + var attr_value = $(elm).prop('name').replace('%INDEX%', index); + $(elm).prop('name', attr_value); }); ref.find('.ftp-user-number').text(index); @@ -141,8 +141,8 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) { var index = $('.data-col2 .ftptable').length + 1; ref.find('input').each(function(i, elm) { - var attr_value = $(elm).attr('name').replace('%INDEX%', index); - $(elm).attr('name', attr_value); + var attr_value = $(elm).prop('name').replace('%INDEX%', index); + $(elm).prop('name', attr_value); }); ref.find('.ftp-user-number').text(index); diff --git a/web/js/pages/edit.web.js b/web/js/pages/edit.web.js index 5f55f86c..f339b46d 100644 --- a/web/js/pages/edit.web.js +++ b/web/js/pages/edit.web.js @@ -74,8 +74,8 @@ App.Actions.WEB.add_ftp_user_form = function() { var index = $('.data-col2 .ftptable').length + 1; ref.find('input').each(function(i, elm) { - var attr_value = $(elm).attr('name').replace('%INDEX%', index); - $(elm).attr('name', attr_value); + var attr_value = $(elm).prop('name').replace('%INDEX%', index); + $(elm).prop('name', attr_value); }); ref.find('.ftp-user-number').text(index); @@ -132,7 +132,34 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) { } } +App.Actions.WEB.randomPasswordGenerated = function(elm) { + return App.Actions.WEB.passwordChanged(elm); +} + +App.Actions.WEB.passwordChanged = function(elm) { + var ref = $(elm).parents('.ftptable'); + if (ref.find('.vst-email-alert-on-psw').length == 0) { + var inp_name = ref.find('.v-ftp-user-is-new').prop('name'); + inp_name = inp_name.replace('is_new', 'v_ftp_email'); + ref.find('tr:last').after('\ + \ + Send FTP credentials to email\ + \ + \ + \ + \ + \ + \ + '); + } +} + // // Page entry point App.Listeners.WEB.keypress_ftp_username(); App.Listeners.WEB.keypress_ftp_path(); + +$('.v-ftp-user-psw').on('keypress', function(evt) { + var elm = $(evt.target); + App.Actions.WEB.passwordChanged(elm); +}); diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index 3cc8dfe4..b500414a 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -49,6 +49,7 @@ } $(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring); + App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm); } function elementHideShow(elementToHideOrShow){ @@ -316,7 +317,7 @@ @@ -364,7 +365,7 @@ @@ -445,7 +446,7 @@
- # () + # ()
-
- # () + # ()
- +