fix: Improve compatibility with Windows for uploaded files

Signed-off-by: Kostiantyn Miakshyn <[email protected]>
nextcloud · Jan 29, 2025 · 3859656 · 3859656
1 parent 862f39e
commit 3859656
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/Constants.php b/lib/Constants.php
@@ -23,7 +23,7 @@ class Constants {
 		'submissionId' => '\d+',
 		'path' => '.+'
 	];
-	
+
 	/**
 	 * Used AppConfig Keys
 	 */
@@ -169,6 +169,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));
 	}
 }