Nemcio/VestaCP
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2026-07-20 10:31:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid repeated and quoted additional FTP username in email

Browse Source 
Avoid repeated and quoted additional FTP username in when changing FTP pass or path.
Before this fix email contains:
Username: test_'test_anna'
Now it is corrected to:
Username: test_anna
This commit is contained in:
dpeca
2017-06-29 11:40:21 +02:00
committed by GitHub
parent 116d8b2e87
commit d446ba1e2b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/edit/web/index.php
View File

@@ -625,6 +625,7 @@ if (!empty($_POST['save'])) {
}
// Change FTP account path
$v_ftp_username_for_emailing = $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_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
@@ -645,7 +646,7 @@ if (!empty($_POST['save'])) {
$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']);
$mailtext = __('FTP_ACCOUNT_READY',$_GET['domain'],$user,$v_ftp_username_for_emailing,$v_ftp_user_data['v_ftp_password']);
send_email($to, $subject, $mailtext, $from);
unset($v_ftp_email);
}