diff --git a/www/editgroup.php3 b/www/editgroup.php3
index 8360c6ce77d0a63ad17dbf1404068a7c15cb85d1..39b835dec0dc38d451d46adabb9fdfa985c33508 100644
--- a/www/editgroup.php3
+++ b/www/editgroup.php3
@@ -127,6 +127,14 @@ echo "
SHOWGROUPMEMBERS($pid, $gid);
+#
+# A delete option
+#
+echo "
+ Do you want to delete this Group?
+ Yes
+ \n";
+
#
# Standard Testbed Footer
#
diff --git a/www/showuser.php3 b/www/showuser.php3
index 8c90ee00c4585e8361ec585ca60f3da01eb7433e..0509692c20e3e10e00abf50408b76b9089fd2772 100644
--- a/www/showuser.php3
+++ b/www/showuser.php3
@@ -52,8 +52,75 @@ if (!$isadmin &&
}
}
+#
+# Show user info.
+#
SHOWUSER($target_uid);
+#
+# Lets show projects.
+#
+$query_result =
+ DBQueryFatal("select distinct g.pid,p.name from group_membership as g ".
+ "left join projects as p on p.pid=g.pid ".
+ "where uid='$target_uid' order by pid");
+
+if (mysql_num_rows($query_result)) {
+ echo "
+ Project Membership
+
+ \n";
+
+ echo "
+ PID |
+ Name |
+
\n";
+
+ while ($projrow = mysql_fetch_array($query_result)) {
+ $pid = $projrow[pid];
+ $name = $projrow[name];
+
+ echo "
+ $pid |
+ $name |
+
\n";
+ }
+ echo "
\n";
+}
+
+#
+# And Experiments.
+#
+$query_result =
+ DBQueryFatal("select * from experiments ".
+ "where expt_head_uid='$target_uid' order by pid,eid");
+
+if (mysql_num_rows($query_result)) {
+ echo "
+ Current Experiments
+
+ \n";
+
+ echo "
+ PID |
+ EID |
+ Name |
+
\n";
+
+ while ($projrow = mysql_fetch_array($query_result)) {
+ $pid = $projrow[pid];
+ $eid = $projrow[eid];
+ $name = $projrow[expt_name];
+
+ echo "
+ $pid |
+ $eid |
+ $name |
+
\n";
+ }
+ echo "
\n";
+}
+
echo "\n";
#
diff --git a/www/showuser_list.php3 b/www/showuser_list.php3
index 140e824aebadcaa63862c994440f9c1fc434c3d5..18bf42656e310b63bae731d87232e636c8dd7b08 100644
--- a/www/showuser_list.php3
+++ b/www/showuser_list.php3
@@ -70,7 +70,8 @@ while ($row = mysql_fetch_array($query_result)) {
# Suck out a list of projects too.
#
$projmemb_result = mysql_db_query($TBDBNAME,
- "SELECT pid FROM group_membership where uid='$thisuid' order by pid");
+ "SELECT distinct pid FROM group_membership ".
+ "where uid='$thisuid' order by pid");
echo "\n";