Use more reliable original file names for attachments (#1070)

This commit is contained in:
Cønstantine Kovalensky 2023-11-09 19:54:53 +04:00 committed by GitHub
commit e1a7630cee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -847,7 +847,7 @@ class Attach
$this->attach_filename = preg_replace('#([\xC2\xC3])([\x80-\xBF])#', 'chr(ord(\'$1\')<<6&0xC0|ord(\'$2\')&0x3F)', $this->attach_filename);
$this->attach_filename = rawurlencode($this->attach_filename);
$this->attach_filename = preg_replace("/(%[0-9A-F]{1,2})/i", '', $this->attach_filename);
$this->attach_filename = trim($this->attach_filename . time());
$this->attach_filename = trim($this->attach_filename . '_' .make_rand_str(13));
}
$this->attach_filename = str_replace(['&amp;', '&', ' '], '_', $this->attach_filename);
$this->attach_filename = str_replace('php', '_php_', $this->attach_filename);