Internal: Fix parameter types for CourseManager::get_user_list_from_course_code() calls + remove unneeded algorithmic complexity

public/main/inc/ajax/course.ajax.php

@@ -67,32 +67,30 @@ switch ($action) {
             }
 
             $courseList = [];
-            if (!empty($list)) {
-                foreach ($list as $course) {
-                    $courseInfo = api_get_course_info_by_id($course['real_id']);
-                    $sessionId = 0;
-                    if (isset($course['session_id']) && !empty($course['session_id'])) {
-                        $sessionId = $course['session_id'];
-                    }
-
-                    $sessionName = '';
-                    if (isset($course['session_name']) && !empty($course['session_name'])) {
-                        $sessionName = ' ('.$course['session_name'].')';
-                    }
+            foreach ($list as $course) {
+                $courseInfo = api_get_course_info_by_id($course['real_id']);
+                $sessionId = 0;
+                if (!empty($course['session_id'])) {
+                    $sessionId = $course['session_id'];
+                }
 
-                    // Skip current course/course session
-                    if ($currentCourseId == $courseInfo['real_id'] && $sessionId == $currentSessionId) {
-                        continue;
-                    }
+                $sessionName = '';
+                if (!empty($course['session_name'])) {
+                    $sessionName = ' ('.$course['session_name'].')';
+                }
 
-                    $courseList['items'][] = [
-                        'id' => $courseInfo['real_id'].'_'.$sessionId,
-                        'text' => $courseInfo['title'].$sessionName,
-                    ];
+                // Skip current course/course session
+                if ($currentCourseId == $courseInfo['real_id'] && $sessionId == $currentSessionId) {
+                    continue;
                 }
 
-                echo json_encode($courseList);
+                $courseList['items'][] = [
+                    'id' => $courseInfo['real_id'].'_'.$sessionId,
+                    'text' => $courseInfo['title'].$sessionName,
+                ];
             }
+
+            echo json_encode($courseList);
         }
         break;
     case 'search_category':
@@ -125,7 +123,7 @@ switch ($action) {
         break;
     case 'search_course':
         if (api_is_teacher() || api_is_platform_admin()) {
-            if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
+            if (!empty($_GET['session_id'])) {
                 //if session is defined, lets find only courses of this session
                 $courseList = SessionManager::get_course_list_by_session_id(
                     $_GET['session_id'],

public/main/inc/lib/course.lib.php

@@ -1253,7 +1253,7 @@ class CourseManager
      * @param array     $extra_field
      * @param array     $courseCodeList
      * @param array     $userIdList
-     * @param string    $filterByActive
+     * @param bool      $filterByActive
      * @param array     $sessionIdList
      * @param string    $searchByKeyword
      *

public/main/user/user.php

@@ -673,6 +673,11 @@ function get_number_of_users()
     $sessionId = api_get_session_id();
     $courseCode = api_get_course_id();
     $active = isset($_GET['active']) ? $_GET['active'] : null;
+    if ($active) {
+        $active = true;
+    } else {
+        $active = false;
+    }
     $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : STUDENT;
 
     if (empty($sessionId)) {
@@ -821,6 +826,13 @@ function get_user_data($from, $number_of_items, $column, $direction)
     }
 
     $active = $_GET['active'] ?? null;
+    if (isset($active)) {
+        if ($active) {
+            $active = true;
+        } else {
+            $active = false;
+        }
+    }
 
     if (empty($sessionId)) {
         $status = $type;
@@ -840,7 +852,7 @@ function get_user_data($from, $number_of_items, $column, $direction)
         null,
         false,
         false,
-        null,
+        [],
         [],
         [],
         $active