Merge pull request #78 from ejeanneaubc/master

youchenlee · web-flow · commit 8635158aa229 · 2016-06-15T13:19:13.000+08:00
Correction for double extensions (one in the name and the extension) by @ejeanneaubc
diff --git a/src/controllers/UploadController.php b/src/controllers/UploadController.php
@@ -104,12 +104,12 @@ private function uploadValidator()
 
     private function getNewName($file)
     {
-        $new_filename = $file->getClientOriginalName();
+        $new_filename = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME);
 
         if (Config::get('lfm.rename_file') === true) {
             $new_filename = uniqid();
         } elseif (Config::get('lfm.alphanumeric_filename') === true) {
-            $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $file->getClientOriginalName());
+            $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $new_filename);
         }
 
         $new_filename = $new_filename . '.' . $file->getClientOriginalExtension();

Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,12 @@ private function uploadValidator()`
`104`	`104`
`105`	`105`	`private function getNewName($file)`
`106`	`106`	`{`
`107`		`- $new_filename = $file->getClientOriginalName();`
	`107`	`+ $new_filename = pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME);`
`108`	`108`
`109`	`109`	`if (Config::get('lfm.rename_file') === true) {`
`110`	`110`	`$new_filename = uniqid();`
`111`	`111`	`} elseif (Config::get('lfm.alphanumeric_filename') === true) {`
`112`		`- $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $file->getClientOriginalName());`
	`112`	`+ $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $new_filename);`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`$new_filename = $new_filename . '.' . $file->getClientOriginalExtension();`