fix: Improve compatibility with Windows for uploaded files

Signed-off-by: Kostiantyn Miakshyn <[email protected]>
nextcloud · Feb 19, 2025 · 1c1d65e · 1c1d65e
1 parent 332dd9e
commit 1c1d65e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/Constants.php b/lib/Constants.php
@@ -155,6 +155,19 @@ class Constants {
 		'x-office/spreadsheet',
 	];
 
+	public const FILENAME_INVALID_CHARS = [
+		"\n",
+		'/',
+		'\\',
+		':',
+		'*',
+		'?',
+		'"',
+		'<',
+		'>',
+		'|',
+	];
+
 	/**
 	 * !! Keep in sync with src/mixins/ShareTypes.js !!
 	 */

diff --git a/lib/Service/FormsService.php b/lib/Service/FormsService.php
@@ -785,6 +785,6 @@ public function getTemporaryUploadedFilePath(Form $form, Question $question): st
 	}
 
 	private static function normalizeFileName(string $fileName): string {
-		return str_replace([...mb_str_split(\OCP\Constants::FILENAME_INVALID_CHARS), "\n"], '-', $fileName);
+		return trim(str_replace(Constants::FILENAME_INVALID_CHARS, '-', $fileName));
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -155,6 +155,19 @@ class Constants { @@
     		'x-office/spreadsheet',
     	];
+    	public const FILENAME_INVALID_CHARS = [
+    		"\n",
+    		'/',
+    		'\\',
+    		':',
+    		'*',
+    		'?',
+    		'"',
+    		'<',
+    		'>',
+    		'|',
+    	];
     	/**
     	 * !! Keep in sync with src/mixins/ShareTypes.js !!
     	 */
@@ Expand Down @@