Skip to content

Commit d446ba1

Browse files
authored
Avoid repeated and quoted additional FTP username in email
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
1 parent 116d8b2 commit d446ba1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

web/edit/web/index.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@
625625
}
626626

627627
// Change FTP account path
628+
$v_ftp_username_for_emailing = $v_ftp_user_data['v_ftp_user'];
628629
$v_ftp_username = $user . '_' . $v_ftp_user_data['v_ftp_user']; //preg_replace("/^".$user."_/", "", $v_ftp_user_data['v_ftp_user']);
629630
$v_ftp_username = escapeshellarg($v_ftp_username);
630631
$v_ftp_path = escapeshellarg(trim($v_ftp_user_data['v_ftp_path']));
@@ -645,7 +646,7 @@
645646
$subject = __("FTP login credentials");
646647
$hostname = exec('hostname');
647648
$from = __('MAIL_FROM',$hostname);
648-
$mailtext = __('FTP_ACCOUNT_READY',$_GET['domain'],$user,$v_ftp_username,$v_ftp_user_data['v_ftp_password']);
649+
$mailtext = __('FTP_ACCOUNT_READY',$_GET['domain'],$user,$v_ftp_username_for_emailing,$v_ftp_user_data['v_ftp_password']);
649650
send_email($to, $subject, $mailtext, $from);
650651
unset($v_ftp_email);
651652
}

0 commit comments

Comments
 (0)