From 2e35167e8e8be5c91de2a09dcebb92e7a7410d8d Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 14 Feb 2018 20:57:20 +0200 Subject: [ci skip] Apply #5394 (multibyte filename serving) to #5397 (Image_lib dynamic_output filename) --- system/libraries/Image_lib.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'system') diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index f37f25f5e..dbe5cbbd1 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -1548,7 +1548,16 @@ class CI_Image_lib { */ public function image_display_gd($resource) { - header('Content-Disposition: filename='.basename(empty($this->new_image) ? $this->source_image : $this->new_image).';'); + // RFC 6266 allows for multibyte filenames, but only in UTF-8, + // so we have to make it conditional ... + $filename = basename(empty($this->new_image) ? $this->source_image : $this->new_image); + $charset = strtoupper(config_item('charset')); + $utf8_filename = ($charset !== 'UTF-8') + ? get_instance()->utf8->convert_to_utf8($filename, $charset) + : $filename; + isset($utf8_filename[0]) && $utf8_filename = " filename*=UTF-8''".rawurlencode($utf8_filename); + + header('Content-Disposition: filename="'.$filename.'";'.$utf8_filename); header('Content-Type: '.$this->mime_type); header('Content-Transfer-Encoding: binary'); header('Last-Modified: '.gmdate('D, d M Y H:i:s', time()).' GMT'); -- cgit v1.2.3-24-g4f1b