Merge pull request #5 from justcoded/develop

Fix file manager name replacement
justcoded · Feb 2, 2018 · a520728 · a520728
2 parents 643a835 + d0c522d
commit a520728
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/FileManager/FileManager.php b/src/FileManager/FileManager.php
@@ -45,12 +45,12 @@ public function upload(array $fields)
 				$fileField = $_FILES[$field];
 				$file = new File($fileField);
 
-				$name = preg_replace('/[^\00-\255]+/u', '', $file->name);
-				$name = str_replace('"', '', trim($name));
-				$path = realpath($this->uploadPath) . '/' . $name . $file->uniqueName;
+				$name = preg_replace('/[^a-z0-9\-\_\.]+/iu', '', trim($file->name));
+				$name = preg_replace('/(\.[a-z0-9]+)$/i', '', $name);
+				$path = realpath($this->uploadPath) . '/' . $name . '-' . $file->uniqueName;
 
 				if ($file->error == 0 && move_uploaded_file($file->tmp_name, $path)) {
-					$file->uploadUrl = $this->uploadUrl . '/' . $name . $file->uniqueName;
+					$file->uploadUrl = $this->uploadUrl . '/' . $name . '-' . $file->uniqueName;
 					$file->uploadPath = $path;
 					$_POST[$field] = $file;
 					$files[] = $file;