Просмотр исходного кода

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
dpeca 8 лет назад
Родитель
Сommit
d446ba1e2b
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      web/edit/web/index.php

+ 2 - 1
web/edit/web/index.php

@@ -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);
                 }