Merge remote-tracking branch 'upstream/1.11.x' into orouba-22963

Author: christianbeeznest

main/gradebook/gradebook_add_result.php

@@ -8,6 +8,17 @@
 api_protect_course_script(true);
 api_block_anonymous_users();
 GradebookUtils::block_students();
+ 
+if (isset($_GET['import'])) {
+    $queryString = $_SERVER['QUERY_STRING'];
+    $webPath = api_get_path(WEB_CODE_PATH);
+    $newUrl = $webPath . 'gradebook/gradebook_view_result.php';
+    if (!empty($queryString)) {
+        $newUrl .= '?' . $queryString;
+    }
+    header("Location: $newUrl");
+    exit;
+}
 
 $selectEval = isset($_GET['selecteval']) ? (int) $_GET['selecteval'] : 0;
 

main/inc/lib/groupmanager.lib.php

@@ -1427,9 +1427,16 @@ public static function fillGroupWithUsers($groupInfo)
             return false;
         }
         $session_id = api_get_session_id();
+        $studentStatus = 5;
+        if (isset($session_id) && $session_id != 0) {
+            $studentStatus = 0;
+        }
         $complete_user_list = CourseManager::get_user_list_from_course_code(
             $_course['code'],
-            $session_id
+            $session_id,
+            null,
+            null,
+            $studentStatus
         );
         $groupIid = $groupInfo['iid'];
         $category = self::get_category_from_group($groupIid);
@@ -1448,6 +1455,7 @@ public static function fillGroupWithUsers($groupInfo)
         }
 
         $usersToAdd = [];
+        shuffle($complete_user_list);
         foreach ($complete_user_list as $userInfo) {
             $isSubscribed = self::is_subscribed($userInfo['user_id'], $groupInfo);
             if ($isSubscribed) {

plugin/azure_active_directory/src/AzureActiveDirectory.php

@@ -312,6 +312,8 @@ public function registerUser(array $azureUserInfo)
                 $extra,
             ] = $this->formatUserData($azureUserInfo);
 
+            $userInfo = api_get_user_info($userId);
+
             $userId = UserManager::update_user(
                 $userId,
                 $firstNme,
@@ -323,7 +325,7 @@ public function registerUser(array $azureUserInfo)
                 STUDENT,
                 null,
                 $phone,
-                null,
+                $userInfo['picture_uri'],
                 null,
                 $active,
                 null,