Add setting "allow_base_course_category" see BT#13829

Show base course categories in portal children.

Author: jmontoyaa

main/admin/course_add.php

@@ -59,7 +59,10 @@
 $form->applyFilter('visual_code', 'api_strtoupper');
 $form->applyFilter('visual_code', 'html_filter');
 
-$countCategories = $courseCategoriesRepo->countAllInAccessUrl($accessUrlId);
+$countCategories = $courseCategoriesRepo->countAllInAccessUrl(
+    $accessUrlId,
+    api_get_configuration_value('allow_base_course_category')
+);
 
 if ($countCategories >= 100) {
     // Category code
@@ -73,9 +76,11 @@
         ['url' => $url]
     );
 } else {
-    $categories = $courseCategoriesRepo->findAllInAccessUrl($accessUrlId);
+    $categories = $courseCategoriesRepo->findAllInAccessUrl(
+        $accessUrlId,
+        api_get_configuration_value('allow_base_course_category')
+    );
     $categoriesOptions = [null => get_lang('None')];
-
     /** @var CourseCategory $category */
     foreach ($categories as $category) {
         $categoriesOptions[$category->getCode()] = (string) $category;

main/admin/course_category.php

@@ -80,6 +80,7 @@
 ];
 
 Display::display_header($tool_name);
+$urlId = api_get_current_access_url_id();
 
 if ($action == 'add' || $action == 'edit') {
     echo '<div class="actions">';
@@ -168,26 +169,30 @@
     $form->display();
 } else {
     // If multiple URLs and not main URL, prevent deletion and inform user
-    if ($action == 'delete' && api_get_multiple_access_url() && api_get_current_access_url_id() != 1) {
+    if ($action == 'delete' && api_get_multiple_access_url() && $urlId != 1) {
         echo Display::return_message(get_lang('CourseCategoriesAreGlobal'), 'warning');
     }
     echo '<div class="actions">';
     $link = null;
     if (!empty($parentInfo)) {
         $parentCode = $parentInfo['parent_id'];
         echo Display::url(
-            Display::return_icon('back.png', get_lang("Back"), '', ICON_SIZE_MEDIUM),
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM),
             api_get_path(WEB_CODE_PATH).'admin/course_category.php?category='.$parentCode
         );
     }
 
     if (empty($parentInfo) || $parentInfo['auth_cat_child'] == 'TRUE') {
-        echo Display::url(
-            Display::return_icon('new_folder.png', get_lang("AddACategory"), '', ICON_SIZE_MEDIUM),
+        $newCategoryLink = Display::url(
+            Display::return_icon('new_folder.png', get_lang('AddACategory'), '', ICON_SIZE_MEDIUM),
             api_get_path(WEB_CODE_PATH).'admin/course_category.php?action=add&category='.Security::remove_XSS($category)
         );
-    }
 
+        if (!empty($parentInfo) && $parentInfo['access_url_id'] != $urlId) {
+            $newCategoryLink = '';
+        }
+        echo $newCategoryLink;
+    }
     echo '</div>';
     if (!empty($parentInfo)) {
         echo Display::page_subheader($parentInfo['name'].' ('.$parentInfo['code'].')');

main/admin/course_edit.php

@@ -145,7 +145,10 @@
 $form->applyFilter('visual_code', 'strtoupper');
 $form->applyFilter('visual_code', 'html_filter');
 
-$countCategories = $courseCategoriesRepo->countAllInAccessUrl($urlId);
+$countCategories = $courseCategoriesRepo->countAllInAccessUrl(
+    $urlId,
+    api_get_configuration_value('allow_base_course_category')
+);
 if ($countCategories >= 100) {
     // Category code
     $url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_category';
@@ -164,7 +167,10 @@
     }
 } else {
     $courseInfo['category_code'] = $courseInfo['categoryCode'];
-    $categories = $courseCategoriesRepo->findAllInAccessUrl($urlId);
+    $categories = $courseCategoriesRepo->findAllInAccessUrl(
+        $urlId,
+        api_get_configuration_value('allow_base_course_category')
+    );
     $categoriesOptions = [null => get_lang('None')];
 
     /** @var CourseCategory $category */

main/auth/courses.php

@@ -4,7 +4,7 @@
 use Chamilo\CoreBundle\Entity\SequenceResource;
 
 /**
-* Template (front controller in MVC pattern) used for distpaching
+* Template (front controller in MVC pattern) used for dispatching
  * to the controllers depend on the current action
 * @author Christian Fasanando <christian1827@gmail.com> - Beeznest
 * @package chamilo.auth