Merge pull request #7 from pm14kas/task-63726

fix on uploading files with url encoded name (from some email clients…
intaro · Dec 4, 2019 · b4077cd · b4077cd
2 parents 90499c3 + 419008b
commit b4077cd
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/Services/FileUploader.php b/Services/FileUploader.php
@@ -83,11 +83,32 @@ public function generateNameByOriginal($originalName)
         return sprintf(
             '%s-%s',
             uniqid(),
-            preg_replace(
-                '/\s+/',
-                '-',
-                $this->translator->transliterate($originalName)
-            )
+            $this->clearName($originalName)
+        );
+    }
+
+    /**
+     * Name cleanup
+     * @param $originalName
+     * @return string
+     */
+    protected function clearName($originalName)
+    {
+        //basic check on URL encoding
+        if (urldecode($originalName) !== $originalName) {
+            $originalName = urldecode($originalName);
+        }
+
+        $originalName = preg_replace(
+            '/[\+\\/\%]+/',
+            '_',
+            $originalName
+        );
+
+        return preg_replace(
+            '/\s+/',
+            '-',
+            $this->translator->transliterate($originalName)
         );
     }