### Eclipse Workspace Patch 1.0
#P 19stable
Index: admin/roles/assign.html
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/assign.html,v
retrieving revision 1.31.2.1
diff -u -r1.31.2.1 assign.html
--- admin/roles/assign.html	12 Dec 2007 03:28:41 -0000	1.31.2.1
+++ admin/roles/assign.html	1 Apr 2008 04:30:57 -0000
@@ -28,7 +28,7 @@
                 } else {
                     $hidden="";
                 }
-                echo "<option value=\"$contextuser->id\">".$fullname.", ".$contextuser->email.$hidden."</option>\n";
+                echo "<option value=\"$contextuser->id\">".$contextuser->lastname.", ".$contextuser->firstname." (".$contextuser->username.")".$hidden."</option>\n"; //JCP-09
                 $i++;    
             }
             if ($i==0) {
@@ -64,7 +64,7 @@
                 echo "<optgroup label=\"$strsearchresults (" . $usercount . ")\">\n";
                 while ($user = rs_fetch_next_record($availableusers)) {
                     $fullname = fullname($user, true);
-                    echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                    echo "<option value=\"$user->id\">".$user->lastname.", ".$user->firstname." (".$user->username.")"."</option>\n"; //JCP-09                    
                     $i++;
                 }
                 echo "</optgroup>\n";
@@ -76,7 +76,7 @@
                 } else {
                     while ($user = rs_fetch_next_record($availableusers)) {
                         $fullname = fullname($user, true);
-                        echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                        echo "<option value=\"$user->id\">".$user->lastname.", ".$user->firstname." (".$user->username.")"."</option>\n"; //JCP-09                        
                         $i++;
                     }
                 }
Index: admin/roles/assign.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/roles/assign.php,v
retrieving revision 1.63.2.11
diff -u -r1.63.2.11 assign.php
--- admin/roles/assign.php	29 Feb 2008 08:40:39 -0000	1.63.2.11
+++ admin/roles/assign.php	1 Apr 2008 04:30:57 -0000
@@ -289,7 +289,7 @@
     /// Get all existing participants in this context.
         // Why is this not done with get_users???
 
-        if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, ra.hidden')) {
+            if (!$contextusers = get_role_users($roleid, $context, false, 'u.id, u.firstname, u.lastname, u.email, u.username, ra.hidden')) { //JCP-09                        
             $contextusers = array();
         }
 
@@ -303,7 +303,7 @@
             $LIKE      = sql_ilike();
             $FULLNAME  = sql_fullname();
 
-            $selectsql = " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%') ";
+            $selectsql = " AND ($FULLNAME $LIKE '%$searchtext%' OR email $LIKE '%$searchtext%' OR username $LIKE '%$searchtext%') "; //JCP-09            
             $select  .= $selectsql;
         } else {
             $selectsql = "";
@@ -344,7 +344,7 @@
                 if ($validroleids) {
                     $roleids =  '('.implode(',', $validroleids).')';
 
-                    $select = " SELECT u.id, u.firstname, u.lastname, u.email";
+                    $select = " SELECT u.id, u.firstname, u.lastname, u.email, u.username"; //JCP-09                    
                     $countselect = "SELECT COUNT(u.id)";
                     $from   = " FROM {$CFG->prefix}user u
                                 INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id
@@ -378,7 +378,7 @@
 
             /// MDL-11111 do not include user already assigned this role in this context as available users
             /// so that the number of available users is right and we save time looping later
-            $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email
+            $availableusers = get_recordset_sql('SELECT id, firstname, lastname, email, username
                                                 FROM '.$CFG->prefix.'user
                                                 WHERE '.$select.'
                                                 AND id NOT IN (
@@ -389,7 +389,7 @@
                                                     AND u.id = r.userid
                                                     AND r.roleid = '.$roleid.'
                                                     '.$selectsql.')
-                                                ORDER BY lastname ASC, firstname ASC');
+                                                ORDER BY lastname ASC, firstname ASC'); //JCP-09
 
             $usercount = $availableusers->_numOfRows;         
         }
Index: group/members.php
===================================================================
RCS file: /cvsroot/moodle/moodle/group/members.php,v
retrieving revision 1.3.2.4
diff -u -r1.3.2.4 members.php
--- group/members.php	19 Mar 2008 10:46:32 -0000	1.3.2.4
+++ group/members.php	1 Apr 2008 04:30:57 -0000
@@ -78,11 +78,11 @@
 $groupmemberscount = 0;
 
 // Get members, organised by role, and display
-if ($groupmemberroles = groups_get_members_by_role($groupid,$courseid,'u.id,u.firstname,u.lastname')) {
+if ($groupmemberroles = groups_get_members_by_role($groupid,$courseid,'u.id,u.firstname,u.lastname,u.username')) { //JCP-08
     foreach($groupmemberroles as $roleid=>$roledata) {
         $groupmembersoptions .= '<optgroup label="'.htmlspecialchars($roledata->name).'">';
         foreach($roledata->users as $member) {
-            $groupmembersoptions .= '<option value="'.$member->id.'">'.fullname($member, true).'</option>';
+            $groupmembersoptions .= '<option value="'.$member->id.'">'.$member->lastname.', '.$member->firstname.' ('.$member->username.')'.'</option>'; //JCP-08
             $groupmemberscount ++;
         }
         $groupmembersoptions .= '</optgroup>';
@@ -125,7 +125,7 @@
         foreach($potentialmembersbyrole as $roleid=>$roledata) {
             $potentialmembersoptions .= '<optgroup label="'.htmlspecialchars($roledata->name).'">';
             foreach($roledata->users as $member) {
-                $name=htmlspecialchars(fullname($member, true));
+                $name=$member->lastname.', '.$member->firstname.' ('.$member->username.')'; //JCP-08
                 $potentialmembersoptions .= '<option value="'.$member->id.
                     '" title="'.$name.'">'.$name.
                     ' ('.@count($usergroups[$member->id]).')</option>';
Index: group/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/group/lib.php,v
retrieving revision 1.8.2.6
diff -u -r1.8.2.6 lib.php
--- group/lib.php	29 Feb 2008 08:40:40 -0000	1.8.2.6
+++ group/lib.php	1 Apr 2008 04:30:57 -0000
@@ -329,7 +329,7 @@
 
 /// Construct the main SQL
     $select = " SELECT r.id AS roleid,r.shortname AS roleshortname,r.name AS rolename,
-                       u.id AS userid, u.firstname, u.lastname";
+                       u.id AS userid, u.firstname, u.lastname, u.username"; //JCP-08
     $from   = " FROM {$CFG->prefix}user u
                 INNER JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id
                 INNER JOIN {$CFG->prefix}role r ON r.id = ra.roleid";