Merge pull request #784 from tentwofour/feature_slugified_filenames_f…

…or_3.3 Backport #780 to the 3.3 branch
Kunstmaan · Oct 26, 2015 · 0535fff · 0535fff
2 parents e7de1f2 + 0f25942
commit 0535fff
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Kunstmaan/MediaBundle/Helper/File/FileHandler.php b/src/Kunstmaan/MediaBundle/Helper/File/FileHandler.php
@@ -11,6 +11,7 @@
 use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Kunstmaan\UtilitiesBundle\Helper\Slugifier;
 
 /**
  * FileHandler
@@ -213,17 +214,22 @@ public function getOriginalFile(Media $media)
      */
     private function getFilePath(Media $media)
     {
-        $filename = $media->getOriginalFilename();
-        $filename = str_replace(array('/', '\\'), '', $filename);
+        $filename  = $media->getOriginalFilename();
+        $filename  = str_replace(array('/', '\\', '%'), '', $filename);
+        $slugifier = new Slugifier();
 
         if (!empty($this->blacklistedExtensions)) {
             $filename = preg_replace('/\.('.join('|', $this->blacklistedExtensions).')$/', '.txt', $filename);
         }
 
+        $parts    = pathinfo($filename);
+        $filename = $slugifier->slugify($parts['filename']);
+        $filename .= '.'.$parts['extension'];
+
         return sprintf(
             '%s/%s',
             $media->getUuid(),
-            strtolower($filename)
+            $filename
         );
     }