37770: Download all submissions, Umlaut-problems

ILIAS-eLearning · Jan 7, 2025 · 0811b82 · 0811b82
1 parent 851e673
commit 0811b82
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/Modules/Exercise/classes/class.ilFSStorageExercise.php b/Modules/Exercise/classes/class.ilFSStorageExercise.php
@@ -208,11 +208,7 @@ public function uploadFile(
         if (isset($a_http_post_file) && $a_http_post_file['size']) {
             $filename = $a_http_post_file['name'];
 
-            $filename = ilFileUtils::getValidFilename($filename);
-            // replace whitespaces with underscores
-            $filename = preg_replace("/\s/", "_", $filename);
-            // remove all special characters
-            $filename = preg_replace("/[^_a-zA-Z0-9\.]/", "", $filename);
+            $filename = $this->getStorageFilename($filename);
 
             if (!is_dir($savepath = $this->getAbsoluteSubmissionPath())) {
                 ilFileUtils::makeDir($savepath);
@@ -261,6 +257,19 @@ public function uploadFile(
         return $result;
     }
 
+    protected function getStorageFilename(string $filename): string
+    {
+        global $DIC;
+
+        $filename = ilFileUtils::getValidFilename($filename);
+        // replace whitespaces with underscores
+        $filename = preg_replace("/\s/", "_", $filename);
+        $filename = (new \ilFileServicesPolicy($DIC->fileServiceSettings()))->ascii($filename);
+        // remove all special characters
+        $filename = preg_replace("/[^_a-zA-Z0-9\.]/", "", $filename);
+        return $filename;
+    }
+
     /**
      * store delivered file in filesystem
      * @param array $a_http_post_file
@@ -277,11 +286,7 @@ public function addFileUpload(
         $this->create();
 
         $filename = $result->getName();
-        $filename = ilFileUtils::getValidFilename($filename);
-        // replace whitespaces with underscores
-        $filename = preg_replace("/\s/", "_", $filename);
-        // remove all special characters
-        $filename = preg_replace("/[^_a-zA-Z0-9\.]/", "", $filename);
+        $filename = $this->getStorageFilename($filename);
 
         $savepath = $this->getRelativeSubmissionPath();
         $savepath .= '/' . $user_id;

diff --git a/Services/UICore/classes/MetaTemplate/PageContentGUI.php b/Services/UICore/classes/MetaTemplate/PageContentGUI.php
@@ -381,7 +381,6 @@ protected function getMessageTextForType(string $type): ?string
     protected function getTabsHTML(): void
     {
         global $DIC;
-
         $ilTabs = $DIC["ilTabs"];
 
         if ($this->template->blockExists("tabs_outer_start")) {