organize pull requests, fix compatibility for Laravel 5.0

Author: streamtw

src/LaravelFilemanagerServiceProvider.php

@@ -33,7 +33,7 @@ public function boot()
         ], 'lfm_public');
 
         $this->publishes([
-            __DIR__.'/views'  => resource_path('views/vendor/laravel-filemanager'),
+            __DIR__.'/views'  => base_path('resources/views/vendor/laravel-filemanager'),
         ], 'lfm_view');
     }
 

src/controllers/UploadController.php

@@ -103,11 +103,13 @@ private function getNewName($file)
         $new_filename = $file->getClientOriginalName();
 
         if (Config::get('lfm.rename_file') === true) {
-            $new_filename = uniqid() . '.' . $file->getClientOriginalExtension();
+            $new_filename = uniqid();
         } else {
-            $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $file->getClientOriginalName()) . '.' . $file->getClientOriginalExtension();
+            $new_filename = preg_replace('/[^A-Za-z0-9\-\']/', '_', $file->getClientOriginalName());
         }
 
+        $new_filename = $new_filename . '.' . $file->getClientOriginalExtension();
+
         return $new_filename;
     }