Merge pull request #941 from arxeiss/better-slug

Use slug instead of preg_replace

Author: streamtw

src/Controllers/FolderController.php

@@ -2,6 +2,7 @@
 
 namespace UniSharp\LaravelFilemanager\Controllers;
 
+use Illuminate\Support\Str;
 use UniSharp\LaravelFilemanager\Events\FolderIsCreating;
 use UniSharp\LaravelFilemanager\Events\FolderWasCreated;
 
@@ -49,13 +50,20 @@ public function getAddfolder()
         try {
             if ($folder_name === null || $folder_name == '') {
                 return $this->helper->error('folder-name');
-            } elseif ($this->lfm->setName($folder_name)->exists()) {
+            }
+            if ($this->lfm->setName($folder_name)->exists()) {
                 return $this->helper->error('folder-exist');
-            } elseif (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $folder_name)) {
-                return $this->helper->error('folder-alnum');
-            } else {
-                $this->lfm->setName($folder_name)->createFolder();
             }
+
+            if (config('lfm.alphanumeric_directory')) {
+                if (config('lfm.convert_to_alphanumeric')) {
+                    $folder_name = Str::slug($folder_name);
+                } elseif (preg_match('/[^\w\-_]/i', $folder_name)) {
+                    return $this->helper->error('folder-alnum');
+                }
+            }
+
+            $this->lfm->setName($folder_name)->createFolder();
         } catch (\Exception $e) {
             return $e->getMessage();
         }

src/Controllers/RenameController.php

@@ -3,6 +3,9 @@
 namespace UniSharp\LaravelFilemanager\Controllers;
 
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
+use UniSharp\LaravelFilemanager\Events\ImageIsRenaming;
+use UniSharp\LaravelFilemanager\Events\ImageWasRenamed;
 use UniSharp\LaravelFilemanager\Events\FolderIsRenaming;
 use UniSharp\LaravelFilemanager\Events\FolderWasRenamed;
 use UniSharp\LaravelFilemanager\Events\FileIsRenaming;
@@ -35,19 +38,34 @@ public function getRename()
             }
         }
 
-        if ($is_directory && config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {
-            return response()->json(parent::error('folder-alnum'), 400);
-        } elseif (config('lfm.alphanumeric_filename') && preg_match('/[^.\w-]/i', $new_name)) {
-            return response()->json(parent::error('file-alnum'), 400);
-        } elseif ($this->lfm->setName($new_name)->exists()) {
-            return response()->json(parent::error('rename'), 400);
-        }
+        if ($is_directory && config('lfm.alphanumeric_directory')) {
+            if (config('lfm.convert_to_alphanumeric')) {
+                $new_name = Str::slug($new_name);
+            }
 
-        if (! $is_directory) {
+            if (preg_match('/[^\w\-_]/i', $new_name)) {
+                return parent::error('folder-alnum');
+            }
+        } elseif (!$is_directory && config('lfm.alphanumeric_filename')) {
+            // Remove extension for checks to alphanum characters
             $extension = $old_file->extension();
             if ($extension) {
-                $new_name = str_replace('.' . $extension, '', $new_name) . '.' . $extension;
+                $new_name = str_replace('.' . $extension, '', $new_name);
+            }
+
+            if (config('lfm.convert_to_alphanumeric')) {
+                $new_name = Str::slug($new_name);
+            }
+
+            if (preg_match('/[^\w\-_]/i', $new_name)) {
+                return parent::error('file-alnum');
             }
+
+            $new_name .= ($extension) ? '.' . $extension : null;
+        }
+
+        if ($this->lfm->setName($new_name)->exists()) {
+            return parent::error('rename');
         }
 
         $new_path = $this->lfm->setName($new_name)->path('absolute');

src/LfmPath.php

@@ -3,6 +3,8 @@
 namespace UniSharp\LaravelFilemanager;
 
 use Illuminate\Container\Container;
+use Illuminate\Support\Str;
+use Intervention\Image\Facades\Image;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use UniSharp\LaravelFilemanager\Services\ImageService;
 use UniSharp\LaravelFilemanager\Events\FileIsUploading;
@@ -287,7 +289,7 @@ private function getNewName($file)
         if (config('lfm.rename_file') === true) {
             $new_file_name = uniqid();
         } elseif (config('lfm.alphanumeric_filename') === true) {
-            $new_file_name = preg_replace('/[^A-Za-z0-9\-\']/', '_', $new_file_name);
+            $new_file_name = Str::slug($new_file_name);
         }
 
         if ($extension) {

src/config/lfm.php

@@ -112,6 +112,9 @@
 
     'alphanumeric_directory'   => false,
 
+    // When creating folder or renaming folder/file, automatically convert to alphanumeric instead of error
+    'convert_to_alphanumeric'  => false,
+
     'should_validate_size'     => false,
 
     'should_validate_mime'     => true,