From 2fd369d746e6ca762f7328ac76312c439eaeca5a Mon Sep 17 00:00:00 2001 From: steeffeen Date: Sun, 29 Jun 2014 22:18:14 +0200 Subject: [PATCH] very restrictive file name clearing (windows sucks) --- application/core/Files/FileUtil.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/core/Files/FileUtil.php b/application/core/Files/FileUtil.php index 6ba28b93..4dd951af 100644 --- a/application/core/Files/FileUtil.php +++ b/application/core/Files/FileUtil.php @@ -56,9 +56,9 @@ abstract class FileUtil { */ public static function getClearedFileName($fileName) { $fileName = Formatter::stripCodes($fileName); - $fileName = str_replace(array(DIRECTORY_SEPARATOR, '\\', '/', ':', '*', '?', '"', '<', '>', '|'), '_', $fileName); - $fileName = preg_replace('/[^[:print:]]/', '', $fileName); $fileName = Formatter::utf8($fileName); + $fileName = preg_replace('/[^0-9A-Za-z\-\+\.\_\ ]/', null, $fileName); + $fileName = preg_replace('/ /', '_', $fileName); return $fileName; }