Commit c56a2e1b authored by Leigh Stoller's avatar Leigh Stoller

Order users by uid.

parent 209051b4
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2007 University of Utah and the Flux Group.
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
# All rights reserved.
#
include("defs.php3");
......@@ -149,6 +149,7 @@ function SPITFORM($formfields, $errors)
$target_idx = $target_user->uid_idx();
$trust = $target_user->GetTempData();
$showurl = CreateURL("showuser", $target_user);
$longname = $target_user->name();
if ($defaultgroup) {
echo "<tr>
......@@ -156,7 +157,7 @@ function SPITFORM($formfields, $errors)
<input type=hidden
name=\"formfields[change_$target_idx]\"
value=permit>
<A href='$showurl'>$target_uid &nbsp</A>
<A href='$showurl'>$target_uid ($longname) &nbsp</A>
</td>\n";
}
else {
......@@ -164,7 +165,7 @@ function SPITFORM($formfields, $errors)
<td>
<input checked type=checkbox value=permit
name=\"formfields[change_$target_idx]\">
<A href='$showurl'>$target_uid &nbsp</A>
<A href='$showurl'>$target_uid ($longname) &nbsp</A>
</td>\n";
}
......@@ -215,6 +216,7 @@ function SPITFORM($formfields, $errors)
foreach ($nonmembers as $target_user) {
$target_uid = $target_user->uid();
$target_idx = $target_user->uid_idx();
$longname = $target_user->name();
$trust = $target_user->GetTempData();
$showurl = CreateURL("showuser", $target_user);
......@@ -222,7 +224,7 @@ function SPITFORM($formfields, $errors)
<td>
<input type=checkbox value=permit
name=\"formfields[add_$target_idx]\">
<A href='$showurl'>$target_uid &nbsp</A>
<A href='$showurl'>$target_uid ($longname) &nbsp</A>
</td>\n";
echo " <td align=center>
......
<?php
#
# EMULAB-COPYRIGHT
# Copyright (c) 2006, 2007 University of Utah and the Flux Group.
# Copyright (c) 2006-2008 University of Utah and the Flux Group.
# All rights reserved.
#
#
......@@ -741,7 +741,8 @@ class Group
" g.pid=m.pid and g.gid=m.gid ".
"where m.pid_idx='$pid_idx' and ".
" m.gid_idx='$gid_idx' and ".
" m.trust!='$trust_none'");
" m.trust!='$trust_none' ".
"order by m.uid");
while ($row = mysql_fetch_array($query_result)) {
$uid_idx = $row["uid_idx"];
......@@ -781,7 +782,8 @@ class Group
" a.pid_idx=m.pid_idx and a.gid_idx='$gid_idx' ".
"where m.pid_idx='$pid_idx' and ".
" m.gid_idx=m.pid_idx and a.uid_idx is NULL ".
" and m.trust!='$trust_none'");
" and m.trust!='$trust_none' ".
"order by m.uid");
while ($row = mysql_fetch_array($query_result)) {
$uid_idx = $row["uid_idx"];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment