Merge branch 'AngelFQC-3621' into 1.11.x

main/course_info/infocours.php

@@ -315,14 +315,14 @@ if (api_get_setting('documents_default_visibility_defined_in_course') === 'true'
     $globalGroup[get_lang('DocumentsDefaultVisibility')] = $group;
 }
 
-$group = [
-    $form->createElement('radio', 'show_system_folders', null, get_lang('Yes'), 1),
-    $form->createElement('radio', 'show_system_folders', null, get_lang('No'), 2),
-];
-
-$globalGroup[get_lang('ShowSystemFolders')] = $group;
+if (api_get_setting('show_default_folders') == 'true') {
+    $group = [
+        $form->createElement('radio', 'show_system_folders', null, get_lang('Yes'), 1),
+        $form->createElement('radio', 'show_system_folders', null, get_lang('No'), 2),
+    ];
 
-$myButton = $form->addButtonSave(get_lang('SaveSettings'), 'submit_save', true);
+    $globalGroup[get_lang('ShowSystemFolders')] = $group;
+}
 
 $group = [];
 $group[] = $form->createElement(
@@ -335,6 +335,7 @@ $group[] = $form->createElement(
 $group[] = $form->createElement('radio', 'enable_document_auto_launch', null, get_lang('Deactivate'), 0);
 $globalGroup[get_lang('DocumentAutoLaunch')] = $group;
 
+$myButton = $form->addButtonSave(get_lang('SaveSettings'), 'submit_save', true);
 $globalGroup[] = $myButton;
 
 $form->addPanelOption(

main/inc/lib/document.lib.php

@@ -4202,16 +4202,6 @@ class DocumentManager
      */
     public static function is_folder_to_avoid($path, $is_certificate_mode = false)
     {
-        $foldersToAvoid = [
-            '/HotPotatoes_files',
-            '/certificates',
-        ];
-        $systemFolder = api_get_course_setting('show_system_folders');
-
-        if ($systemFolder == 1) {
-            $foldersToAvoid = [];
-        }
-
         if (basename($path) == 'css') {
             return true;
         }
@@ -4223,6 +4213,23 @@ class DocumentManager
             }
         }
 
+        $foldersToAvoid = [
+            '/HotPotatoes_files',
+            '/certificates',
+        ];
+        $showSystemFolder = api_get_course_setting('show_system_folders');
+
+        // Admin setting for Hide/Show Default folders to all users
+        if (api_get_setting('show_default_folders') == 'false'
+            || 2 == $showSystemFolder
+        ) {
+            $foldersToAvoid[] = '/images';
+            $foldersToAvoid[] = '/flash';
+            $foldersToAvoid[] = '/audio';
+            $foldersToAvoid[] = '/video';
+            $foldersToAvoid[] = '/learning_path';
+        }
+
         // Admin setting for Hide/Show the folders of all users
         if (api_get_setting('show_users_folders') == 'false') {
             $foldersToAvoid[] = '/shared_folder';
@@ -4232,14 +4239,6 @@ class DocumentManager
             }
         }
 
-        // Admin setting for Hide/Show Default folders to all users
-        if (api_get_setting('show_default_folders') == 'false') {
-            $foldersToAvoid[] = '/images';
-            $foldersToAvoid[] = '/flash';
-            $foldersToAvoid[] = '/audio';
-            $foldersToAvoid[] = '/video';
-        }
-
         // Admin setting for Hide/Show chat history folder
         if (api_get_setting('show_chat_folder') == 'false') {
             $foldersToAvoid[] = '/chat_files';