From 67f40a839eb186014d18c898ecbb122267782e35 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 4 Mar 2019 10:21:37 -0500
Subject: [PATCH 1/3] Minor - Remove deprecated comment - refs #2822

---
 main/inc/lib/CoursesAndSessionsCatalog.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main/inc/lib/CoursesAndSessionsCatalog.class.php b/main/inc/lib/CoursesAndSessionsCatalog.class.php
index d47d2164e1..409a0cf3f9 100644
--- a/main/inc/lib/CoursesAndSessionsCatalog.class.php
+++ b/main/inc/lib/CoursesAndSessionsCatalog.class.php
@@ -239,7 +239,6 @@ class CoursesAndSessionsCatalog
 
         $categoriesFromDatabase = CourseCategory::getCategories();
 
-        //$allCategories = CourseCategory::getCategoriesCanBeAddedInCourse();
         foreach ($categoriesFromDatabase as $row) {
             $count_courses = CourseCategory::countCoursesInCategory($row['code']);
             $row['count_courses'] = $count_courses;

From 441138f10b7057ffb78838a4c2e805fc882a70e0 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 4 Mar 2019 10:31:06 -0500
Subject: [PATCH 2/3] Minor - Add PHPDoc to getAllCategories() - refs #2822

---
 main/inc/lib/course_category.lib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/inc/lib/course_category.lib.php b/main/inc/lib/course_category.lib.php
index c55e4560d1..29ad69d535 100755
--- a/main/inc/lib/course_category.lib.php
+++ b/main/inc/lib/course_category.lib.php
@@ -113,9 +113,10 @@ class CourseCategory
     }
 
     /**
-     * @param string $category Optional. Parent category code
-     *
-     * @return array
+     * Returns a flat list of all course categories in this URL. If the
+     * allow_base_course_category option is true, then also show the
+     * course categories of the base URL
+     * @return array [id, name, code, parent_id, tree_pos, children_count, number_courses]
      */
     public static function getAllCategories()
     {

From 071197c7ef3bf6d1b5209252b15d25682fe0d789 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 4 Mar 2019 10:41:41 -0500
Subject: [PATCH 3/3] Security: Filter course category code/name before showing
 categories dropdown - refs #2822

---
 main/auth/courses_categories.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/main/auth/courses_categories.php b/main/auth/courses_categories.php
index 9fa2b4fb3d..fd3a47b68d 100755
--- a/main/auth/courses_categories.php
+++ b/main/auth/courses_categories.php
@@ -296,9 +296,10 @@ function getOptionSelect($categories, $codeType)
     $html = '';
     $html .= '<select name="category_code" onchange="submit();" class="selectpicker form-control">';
     foreach ($categories as $category) {
-        $categoryCode = $category['code'];
-        $countCourse = $category['number_courses'];
-        $level = $category['level'];
+        $categoryCode = Security::remove_XSS($category['code']);
+        $categoryName = Security::remove_XSS($category['name']);
+        $countCourse = (int) $category['number_courses'];
+        $level =  $category['level'];
         if (empty($countCourse)) {
             continue;
         }
@@ -308,7 +309,7 @@ function getOptionSelect($categories, $codeType)
             $separate = '';
         }
         $html .= '<option '.($categoryCode == $codeType ? 'selected="selected" ' : '')
-            .' value="'.$category['code'].'">'.$separate.' '.$category['name'].' ('.$countCourse.') </option>';
+            .' value="'.$categoryCode.'">'.$separate.' '.$categoryName.' ('.$countCourse.') </option>';
     }
     $html .= '</select>';