Merge pull request #1044 from 7ammer/master

streamtw · web-flow · commit 0a1d2370e0f2 · 2021-11-12T01:22:18.000+08:00
Fix where renaming a file fails when alphanumeric directory is true
diff --git a/src/Controllers/RenameController.php b/src/Controllers/RenameController.php
@@ -35,9 +35,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
`@@ -35,9 +35,11 @@ public function getRename()`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {`
	`38`	`+ if ($is_directory && config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {`
`39`	`39`	`return parent::error('folder-alnum');`
`40`		`- // return parent::error('file-alnum');`
	`40`	`+ }`
	`41`	`+ else if (config('lfm.alphanumeric_filename') && preg_match('/[^.\w-]/i', $new_name)) {`
	`42`	`+ return parent::error('file-alnum');`
`41`	`43`	`} elseif ($this->lfm->setName($new_name)->exists()) {`
`42`	`44`	`return parent::error('rename');`
`43`	`45`	`}`