| Username: |
diff --git a/www/modusr_process.php3 b/www/modusr_process.php3
index bfb372af70c0e1d1149f0be8855f9a2a852bc285..f5e6a6e2748c1a2ccbcb5305df0f341e84d6edfc 100644
--- a/www/modusr_process.php3
+++ b/www/modusr_process.php3
@@ -44,7 +44,7 @@ if (!isset($usr_affil) ||
}
#
-# Only known and logged in users can modify info.
+# Only known and logged in users can modify info. uid came in as a POST var.
#
LOGGEDINORDIE($uid);
diff --git a/www/newproject_form.php3 b/www/newproject_form.php3
index 22200612dce5efbc6f9117ee4114c1879acccb95..14f56840e22921464324a138dd8159d1b6041c4f 100644
--- a/www/newproject_form.php3
+++ b/www/newproject_form.php3
@@ -3,20 +3,17 @@ include("defs.php3");
PAGEHEADER("Start a New Project");
-$uid = "";
-if ( ereg("php3\?([[:alnum:]]+)",$REQUEST_URI,$Vals) ) {
- $uid=$Vals[1];
- addslashes($uid);
-} else {
- unset($uid);
-}
+#
+# Get current user.
+#
+$uid = GETLOGIN();
#
# If a uid came in, then we check to see if the login is valid.
# If the login is not valid, then quit cause we don't want to display the
# personal information for some random ?uid argument.
#
-if (isset($uid)) {
+if ($uid) {
if (CHECKLOGIN($uid) != 1) {
USERERROR("You are not logged in. Please log in and try again.", 1);
}
diff --git a/www/nodecontrol.php3 b/www/nodecontrol.php3
index a5d2e4fb3380388e8a9ea4896fac8eb29a911460..4f634693e28ea5bc13bef9e94ba871058dda86e7 100644
--- a/www/nodecontrol.php3
+++ b/www/nodecontrol.php3
@@ -7,6 +7,7 @@ include("defs.php3");
#
# Only known and logged in users can do this.
#
+$uid = GETLOGIN();
LOGGEDINORDIE($uid);
#
@@ -63,10 +64,10 @@ if (! $insert_result) {
# Zap back to the referrer. Seems better than a silly "we did it" message.
#
if ($refer == "list") {
- header("Location: nodecontrol_list.php3?uid=$uid");
+ header("Location: nodecontrol_list.php3");
}
else {
- header("Location: showexp.php3?uid=$uid&exp_pideid=$refer");
+ header("Location: showexp.php3?exp_pideid=$refer");
}
#
diff --git a/www/nodecontrol_form.php3 b/www/nodecontrol_form.php3
index b7f97cd9055203d2867d324c0ad2b941ac24af18..e873d57dad87d3e443303b029d3d4f7d1c0156fa 100644
--- a/www/nodecontrol_form.php3
+++ b/www/nodecontrol_form.php3
@@ -9,8 +9,17 @@ PAGEHEADER("Node Control Form");
#
# Only known and logged in users can do this.
#
+$uid = GETLOGIN();
LOGGEDINORDIE($uid);
+#
+# Verify form arguments.
+#
+if (!isset($node_id) ||
+ strcmp($node_id, "") == 0) {
+ USERERROR("You must provide a node ID.", 1);
+}
+
#
# Check to make sure that this is a valid nodeid
#
@@ -60,7 +69,7 @@ echo "\n";
echo "
diff --git a/www/nodecontrol_list.php3 b/www/nodecontrol_list.php3
index 4761aa484286750def68e440a9141d8e70b22c44..06eb381764f66d8b22d2693405b72ec5f6eb202b 100644
--- a/www/nodecontrol_list.php3
+++ b/www/nodecontrol_list.php3
@@ -9,6 +9,7 @@ PAGEHEADER("Node Control List");
#
# Only known and logged in users can do this.
#
+$uid = GETLOGIN();
LOGGEDINORDIE($uid);
#
@@ -83,7 +84,7 @@ while ($row = mysql_fetch_array($query_result)) {
echo "
-
+
![\"o\"](\"redball.gif\") |
$node_id |
$type |
diff --git a/www/reserved.php3 b/www/reserved.php3
index 838771c6bccd58f4ec50696a13b8a4c318839144..c44fd54b9d643671a02aae6132aa28d1db713b02 100644
--- a/www/reserved.php3
+++ b/www/reserved.php3
@@ -1,30 +1,42 @@
-
-
-Foo
-
-
-Utah Testbed Machine Status
-
-Could not query the database: $err\n";
- exit;
- }
- echo " \n";
- echo "| ID | Type | Reservation Status | \n";
- while ($r = mysql_fetch_array($result)) {
- $id = $r["node_id"]; $type = $r["type"];
- $res = $r["eid"];
- if (!$res || $res == "NULL") {
- $res = " ";
- }
- echo "| $id | $type | $res | \n";
- }
- echo " \n";
+
+ Utah Testbed Machine Status
+ \n";
+
+$query_result = mysql_db_query($TBDBNAME,
+ "SELECT n.node_id, n.type, j.eid from nodes ".
+ "as n left join reserved AS j ON n.node_id = j.node_id");
+if (! $query_result) {
+ $err = mysql_error();
+ TBERROR("Database Error getting node reservation status: $err\n", 1);
+}
+
+echo "\n";
+echo "
+ | ID |
+ Type |
+ Reservation Status |
+ \n";
+
+while ($r = mysql_fetch_array($query_result)) {
+ $id = $r["node_id"]; $type = $r["type"];
+ $res = $r["eid"];
+ if (!$res || $res == "NULL") {
+ $res = "--";
+ }
+ echo "| $id | $type | $res | \n";
+}
+echo " \n";
+
+#
+# Standard Testbed Footer
+#
+PAGEFOOTER();
?>
-
-
diff --git a/www/showexp.php3 b/www/showexp.php3
index 84cb9afe69c9ab568926e45bf24f3eb413b3c2fc..01e7cbbe95431a93e7a479e09ef887dd2ae90545 100644
--- a/www/showexp.php3
+++ b/www/showexp.php3
@@ -10,6 +10,7 @@ PAGEHEADER("Show Experiment Information");
#
# Only known and logged in users can end experiments.
#
+$uid = GETLOGIN();
LOGGEDINORDIE($uid);
$isadmin = ISADMIN($uid);
@@ -91,7 +92,7 @@ echo "
echo "
| Experiment Head: |
-
+
$exp_head |
\n";
@@ -165,7 +166,7 @@ if (mysql_num_rows($reserved_result)) {
echo "
|
-
+
|
$node_id |
$type |
diff --git a/www/showexp_form.php3 b/www/showexp_form.php3
index b8d0aefd9d4ce1c4c6c32b9bbb69a8f2a80d953f..8b69f30749d9adcddb6a34f17e003a186f152ab2 100644
--- a/www/showexp_form.php3
+++ b/www/showexp_form.php3
@@ -9,13 +9,7 @@ PAGEHEADER("Show Experiment Information Form");
#
# Only known and logged in users can end experiments.
#
-$uid = "";
-if ( ereg("php3\?([[:alnum:]]+)",$REQUEST_URI,$Vals) ) {
- $uid=$Vals[1];
- addslashes($uid);
-} else {
- unset($uid);
-}
+$uid = GETLOGIN();
LOGGEDINORDIE($uid);
$isadmin = ISADMIN($uid);
@@ -71,7 +65,7 @@ you are a member of.
|