Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #646, adds an option to keep existing files intact #647

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #646, adds an option to keep existing files intact #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions filemanager/config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@
'replace_with' => "_",
//convert to lowercase the files and folders name
'lower_case' => false,
//Should we rename (translitareation and convert_space) files that are already on the filesystem (true)
//or only the news files (false => keeps the existing files and folders intact)
'fix_existing_files' => true,

//Add ?484899493349 (time value) to returned images to prevent cache
'add_time_to_img' => false,
Expand Down
4 changes: 2 additions & 2 deletions filemanager/dialog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ function extensionSort($x, $y)
continue;
}
$new_name=fix_filename($file,$config);
if($ftp && $file!='..' && $file!=$new_name){
if($ftp && $file!='..' && $file!=$new_name && !empty($config['fix_existing_files']){
//rename
rename_folder($config['current_path'].$subdir.$file,$new_name,$ftp,$config);
$file=$new_name;
Expand Down Expand Up @@ -1138,7 +1138,7 @@ function extensionSort($x, $y)
$file_path=$config['current_path'].$rfm_subfolder.$subdir.$file;
//check if file have illegal caracter

if($file!=fix_filename($file,$config)){
if(!empty($config['fix_existing_files'] && $file!=fix_filename($file,$config)){
$file1=fix_filename($file,$config);
$file_path1=($config['current_path'].$rfm_subfolder.$subdir.$file1);
if(file_exists($file_path1)){
Expand Down