Skip to content

Commit 52c06ff

Browse files
committed
do rename validation in backend
1 parent 5977687 commit 52c06ff

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

src/controllers/RenameController.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ public function getRename()
2222

2323
$old_file = parent::getCurrentPath($old_name);
2424

25+
if (empty($new_name)) {
26+
if (File::isDirectory($old_file)) {
27+
return $this->error('folder-name');
28+
} else {
29+
return $this->error('file-name');
30+
}
31+
}
32+
2533
if (!File::isDirectory($old_file)) {
2634
$extension = File::extension($old_file);
2735
$new_name = str_replace('.' . $extension, '', $new_name) . '.' . $extension;

src/lang/en/lfm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
'message-extension_not_found' => 'Please install gd or imagick extension to crop, resize, and make thumbnails of images.',
3737

3838
'error-rename' => 'File name already in use!',
39+
'error-file-name' => 'File name cannot be empty!',
3940
'error-file-empty' => 'You must choose a file!',
4041
'error-file-exist' => 'A file with this name already exists!',
4142
'error-file-size' => 'File size exceeds server limit! (maximum size: :max)',

src/lang/zh-TW/lfm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
'message-extension_not_found' => '請安裝 gd 或 imagick 以使用縮放、裁剪、及縮圖功能',
3737

3838
'error-rename' => '名稱重複,請重新輸入!',
39+
'error-file-name' => '請輸入檔案名稱!',
3940
'error-file-empty' => '請選擇檔案!',
4041
'error-file-exist' => '相同檔名的檔案已存在!',
4142
'error-file-size' => '檔案過大,無法上傳! (檔案大小上限: :max)',

src/views/script.blade.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,10 @@ function rename(item_name) {
137137
title: "{{ $lang['message-rename'] }}",
138138
value: item_name,
139139
callback: function (result) {
140-
if (result !== null) {
141-
performLfmRequest('{{ route("unisharp.lfm.getRename") }}', {
142-
file: item_name,
143-
new_name: result
144-
}).done(refreshFoldersAndItems);
145-
}
140+
performLfmRequest('{{ route("unisharp.lfm.getRename") }}', {
141+
file: item_name,
142+
new_name: result
143+
}).done(refreshFoldersAndItems);
146144
}
147145
});
148146
}

0 commit comments

Comments
 (0)