From 3509dd97f0af3e1d7b5c9b7444f1d1968fec03e7 Mon Sep 17 00:00:00 2001
From: mjollnir_ <mjollnir_>
Date: Sun, 4 Sep 2005 21:07:36 +0000
Subject: [PATCH] Merged from MOODLE_15_STABLE: Fixing up a bug in the log
 selector to do with optionally showing all users in the dropdown when over
 COURSE_MAX_USERS_PER_DROPDOWN

---
 course/lib.php | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/course/lib.php b/course/lib.php
index a796ee5126c..d3898e0e42e 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -242,25 +242,6 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today"
         $showcourses = 1;
     }
    
-
-    if ($course->category) {
-        if ($selectedgroup) {   // If using a group, only get users in that group.
-            $courseusers = get_group_users($selectedgroup, 'u.lastname ASC', '', 'u.id');
-        } else {
-            $courseusers = get_course_users($course->id, '', '', 'u.id');
-        }
-    } else {
-        $courseusers = get_site_users('u.lastaccess DESC', 'u.id');
-    }
-
-    $numusers = count((array)$courseusers);
-
-
-    if ($numusers < COURSE_MAX_USERS_PER_DROPDOWN && !$showusers) {
-        $showusers = 1;
-    }
-    
-
     /// Setup for group handling.
     $isteacher = isteacher($course->id);
     $isteacheredit = isteacheredit($course->id);
@@ -280,17 +261,21 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate="today"
     // Get all the possible users
     $users = array();
 
-    if ($showusers) {
-        if ($course->category) {
-            if ($selectedgroup) {   // If using a group, only get users in that group.
-                $courseusers = get_group_users($selectedgroup, 'u.lastname ASC', '', 'u.id, u.firstname, u.lastname');
-            } else {
-                $courseusers = get_course_users($course->id, '', '', 'u.id, u.firstname, u.lastname');
-            }
+    if ($course->category) {
+        if ($selectedgroup) {   // If using a group, only get users in that group.
+            $courseusers = get_group_users($selectedgroup, 'u.lastname ASC', '', 'u.id, u.firstname, u.lastname, u.nickname, u.idnumber');
         } else {
-            $courseusers = get_site_users("u.lastaccess DESC", "u.id, u.firstname, u.lastname");
+            $courseusers = get_course_users($course->id, '', '', 'u.id, u.firstname, u.lastname, u.nickname, u.idnumber');
         }
+    } else {
+        $courseusers = get_site_users("u.lastaccess DESC", "u.id, u.firstname, u.lastname, u.nickname, u.idnumber");
+    }
+    
+    if (count($courseusers) < COURSE_MAX_USERS_PER_DROPDOWN && !$showusers) {
+        $showusers = 1;
+    }
 
+    if ($showusers) {
         if ($courseusers) {
             foreach ($courseusers as $courseuser) {
                 $users[$courseuser->id] = fullname($courseuser, $isteacher);