diff --git a/main/document/document.php b/main/document/document.php index c42fb1bd67..3c8b19cbb3 100755 --- a/main/document/document.php +++ b/main/document/document.php @@ -299,7 +299,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'download') { // Download a folder -if (isset($_GET['action']) && $_GET['action'] == 'downloadfolder' && (api_get_setting('students_copy_folders') == 'true' || api_is_allowed_to_edit() || api_is_platform_admin())) { +if (isset($_GET['action']) && $_GET['action'] == 'downloadfolder' && (api_get_setting('students_download_folders') == 'true' || api_is_allowed_to_edit() || api_is_platform_admin())) { //filter when I am into shared folder, I can donwload only my shared folder @@ -318,7 +318,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'downloadfolder' && (api_get_se } // Copy a file to general my files user's -if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && (api_get_setting('students_copy_folders') == 'true')) { +if (isset($_GET['action']) && $_GET['action'] == 'copytomyfiles' && (api_get_setting('students_copy_files') == 'true')) { $clean_get_id = Security::remove_XSS($_GET['id']); $user_folder = api_get_path(SYS_CODE_PATH).'upload/users/'.api_get_user_id().'/my_files/'; diff --git a/main/install/db_main.sql b/main/install/db_main.sql index 440b695e7b..cf78bc5030 100755 --- a/main/install/db_main.sql +++ b/main/install/db_main.sql @@ -753,7 +753,7 @@ VALUES ('block_copy_paste_for_students',NULL,'radio','Editor','false','BlockCopyPasteForStudentsTitle','BlockCopyPasteForStudentsComment',NULL,NULL, 0), ('more_buttons_maximized_mode',NULL,'radio','Editor','false','MoreButtonsForMaximizedModeTitle','MoreButtonsForMaximizedModeComment',NULL,NULL, 0), ('students_download_folders',NULL,'radio','Tools','true','AllowStudentsDownloadFoldersTitle','AllowStudentsDownloadFoldersComment',NULL,NULL, 0), -('students_copy_folders',NULL,'radio','Tools','true','AllowStudentsCopyFoldersTitle','AllowStudentsCopyFoldersComment',NULL,NULL, 0), +('students_copy_files',NULL,'radio','Tools','true','AllowStudentsCopyFilesTitle','AllowStudentsCopyFilesComment',NULL,NULL, 0), ('show_tabs', 'social', 'checkbox', 'Platform', 'true', 'ShowTabsTitle','ShowTabsComment',NULL,'TabsSocial', 0), ('allow_students_to_create_groups_in_social',NULL,'radio','Tools','false','AllowStudentsToCreateGroupsInSocialTitle','AllowStudentsToCreateGroupsInSocialComment',NULL,NULL, 0), ('allow_send_message_to_all_platform_users',NULL,'radio','Tools','false','AllowSendMessageToAllPlatformUsersTitle','AllowSendMessageToAllPlatformUsersComment',NULL,NULL, 0), @@ -968,8 +968,8 @@ VALUES ('more_buttons_maximized_mode','false','No'), ('students_download_folders','true','Yes'), ('students_download_folders','false','No'), -('students_copy_folders','true','Yes'), -('students_copy_folders','false','No'), +('students_copy_files','true','Yes'), +('students_copy_files','false','No'), ('allow_students_to_create_groups_in_social','true','Yes'), ('allow_students_to_create_groups_in_social','false','No'), ('allow_send_message_to_all_platform_users','true','Yes'),