Skip to content

Commit e9be416

Browse files
very-twivery-twi
committed
Send email on user changed ftp user password
1 parent efc777a commit e9be416

File tree

4 files changed

+45
-10
lines changed

4 files changed

+45
-10
lines changed

‎web/edit/web/index.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,13 @@
551551
exec (VESTA_CMD."v-change-web-domain-ftp-path ".$v_username." ".$v_domain." ".$v_ftp_username." ".$v_ftp_path, $output, $return_var);
552552
if ($v_ftp_user_data['v_ftp_password'] != "'••••••••'" && $v_ftp_user_data['v_ftp_password'] != "••••••••" && !empty($v_ftp_user_data['v_ftp_password'])) {
553553
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);
554+
$to = $v_ftp_user_data['v_ftp_email'];
555+
$subject = __("FTP login credentials");
556+
$hostname = exec('hostname');
557+
$from = __('MAIL_FROM',$hostname);
558+
$mailtext = __('FTP_ACCOUNT_READY',$_GET['domain'],$user,$v_ftp_username,$v_ftp_user_data['v_ftp_password']);
559+
send_email($to, $subject, $mailtext, $from);
560+
unset($v_ftp_email);
554561
}
555562
check_return_code($return_var, $output);
556563
unset($output);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ App.Actions.WEB.add_ftp_user_form = function() {
8484
var index = $('.data-col2 .ftptable').length + 1;
8585

8686
ref.find('input').each(function(i, elm) {
87-
var attr_value = $(elm).attr('name').replace('%INDEX%', index);
88-
$(elm).attr('name', attr_value);
87+
var attr_value = $(elm).prop('name').replace('%INDEX%', index);
88+
$(elm).prop('name', attr_value);
8989
});
9090

9191
ref.find('.ftp-user-number').text(index);
@@ -141,8 +141,8 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
141141
var index = $('.data-col2 .ftptable').length + 1;
142142

143143
ref.find('input').each(function(i, elm) {
144-
var attr_value = $(elm).attr('name').replace('%INDEX%', index);
145-
$(elm).attr('name', attr_value);
144+
var attr_value = $(elm).prop('name').replace('%INDEX%', index);
145+
$(elm).prop('name', attr_value);
146146
});
147147

148148
ref.find('.ftp-user-number').text(index);

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

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ App.Actions.WEB.add_ftp_user_form = function() {
7474
var index = $('.data-col2 .ftptable').length + 1;
7575

7676
ref.find('input').each(function(i, elm) {
77-
var attr_value = $(elm).attr('name').replace('%INDEX%', index);
78-
$(elm).attr('name', attr_value);
77+
var attr_value = $(elm).prop('name').replace('%INDEX%', index);
78+
$(elm).prop('name', attr_value);
7979
});
8080

8181
ref.find('.ftp-user-number').text(index);
@@ -132,7 +132,34 @@ App.Actions.WEB.toggle_additional_ftp_accounts = function(elm) {
132132
}
133133
}
134134

135+
App.Actions.WEB.randomPasswordGenerated = function(elm) {
136+
return App.Actions.WEB.passwordChanged(elm);
137+
}
138+
139+
App.Actions.WEB.passwordChanged = function(elm) {
140+
var ref = $(elm).parents('.ftptable');
141+
if (ref.find('.vst-email-alert-on-psw').length == 0) {
142+
var inp_name = ref.find('.v-ftp-user-is-new').prop('name');
143+
inp_name = inp_name.replace('is_new', 'v_ftp_email');
144+
ref.find('tr:last').after('<tr>\
145+
<td class="vst-text step-left input-label">\
146+
Send FTP credentials to email\
147+
</td>\
148+
</tr>\
149+
<tr>\
150+
<td class="step-left">\
151+
<input type="text" value="" name="' + inp_name + '" class="vst-input vst-email-alert-on-psw">\
152+
</td>\
153+
</tr>');
154+
}
155+
}
156+
135157
//
136158
// Page entry point
137159
App.Listeners.WEB.keypress_ftp_username();
138160
App.Listeners.WEB.keypress_ftp_path();
161+
162+
$('.v-ftp-user-psw').on('keypress', function(evt) {
163+
var elm = $(evt.target);
164+
App.Actions.WEB.passwordChanged(elm);
165+
});

‎web/templates/admin/edit_web.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
}
5050

5151
$(elm).parents('.ftptable').find('.v-ftp-user-psw').val(ftprandomstring);
52+
App.Actions.WEB.randomPasswordGenerated && App.Actions.WEB.randomPasswordGenerated(elm);
5253
}
5354

5455
function elementHideShow(elementToHideOrShow){
@@ -316,7 +317,7 @@
316317
<table style="display:<?php if (empty($v_ftp_user)) { echo 'none';} else {echo 'block';}?> ;" class="ftptable ftptable-nrm" name="v_add_domain_ftp">
317318
<tr>
318319
<td class="vst-text input-label">
319-
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('delete') ?>)</a>
320+
<?php print __('FTP') ?> #<span class="ftp-user-number"><?php print $i + 1; ?></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
320321
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[<?php print $i ?>][delete]" value="0" />
321322
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[<?php print $i ?>][is_new]" value="<?php print $ftp_user['is_new'] ?>" />
322323
</td>
@@ -364,7 +365,7 @@
364365
</tr>
365366
<tr>
366367
<td class="step-left">
367-
<input type="text" class="vst-input" name="v_ftp_user[<?php print $i ?>][v_ftp_email]" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
368+
<input type="text" class="vst-input vst-email-alert-on-psw" name="v_ftp_user[<?php print $i ?>][v_ftp_email]" <?php if (!empty($v_ftp_email)) echo "value=".$v_ftp_email; ?>>
368369
</td>
369370
</tr>
370371
<?php endif; ?>
@@ -398,7 +399,7 @@
398399
<table class="ftptable ftptable-nrm" name="v_add_domain_ftp">
399400
<tr>
400401
<td class="vst-text input-label">
401-
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control do_delete" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('delete') ?>)</a>
402+
<?php print __('FTP') ?> #<span class="ftp-user-number"></span> <a class="ftp-remove-user additional-control" onCLick="App.Actions.WEB.remove_ftp_user(this)">(<?php print __('remove') ?>)</a>
402403
<input type="hidden" class="v-ftp-user-deleted" name="v_ftp_user[%INDEX%][delete]" value="0" />
403404
<input type="hidden" class="v-ftp-user-is-new" name="v_ftp_user[%INDEX%][is_new]" value="1" />
404405
</td>
@@ -445,7 +446,7 @@
445446
</tr>
446447
<tr>
447448
<td class="step-left">
448-
<input type="text" class="vst-input" name="v_ftp_user[%INDEX%][v_ftp_email]" value="">
449+
<input type="text" class="vst-input vst-email-alert-on-psw" name="v_ftp_user[%INDEX%][v_ftp_email]" value="">
449450
</td>
450451
</tr>
451452
</table>

0 commit comments

Comments
 (0)