Fix where renaming a file fails when alphanumeric directory is true

James Isbell · James Isbell · commit 5ed91604530f · 2021-02-10T10:45:15.000Z
diff --git a/src/Controllers/RenameController.php b/src/Controllers/RenameController.php
@@ -33,9 +33,11 @@ public function getRename()
             }
         }
 
-        if (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {
+        if ($is_directory && config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {
             return parent::error('folder-alnum');
-        // return parent::error('file-alnum');
+        }
+        else if (config('lfm.alphanumeric_filename') && preg_match('/[^.\w-]/i', $new_name)) {
+	        return parent::error('file-alnum');
         } elseif ($this->lfm->setName($new_name)->exists()) {
             return parent::error('rename');
         }

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,11 @@ public function getRename()`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- if (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {`
	`36`	`+ if ($is_directory && config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {`
`37`	`37`	`return parent::error('folder-alnum');`
`38`		`- // return parent::error('file-alnum');`
	`38`	`+ }`
	`39`	`+ else if (config('lfm.alphanumeric_filename') && preg_match('/[^.\w-]/i', $new_name)) {`
	`40`	`+ return parent::error('file-alnum');`
`39`	`41`	`} elseif ($this->lfm->setName($new_name)->exists()) {`
`40`	`42`	`return parent::error('rename');`
`41`	`43`	`}`