Commit 443920d4 authored by Leigh Stoller's avatar Leigh Stoller

A set of minor changes, mostly instigated by Pat who found a bunch

of problems.
parent d5596b15
Options Includes
ErrorDocument 404 /error.shtml
ErrorDocument 403 /error.shtml
......@@ -26,6 +26,7 @@ FILES += $(wildcard $(SRCDIR)/*.jpg)
FILES += $(wildcard $(SRCDIR)/*.gif)
FILES += $(wildcard $(SRCDIR)/*.html)
FILES += $(wildcard $(SRCDIR)/*.php3)
FILES += $(SRCDIR)/.htaccess $(SRCDIR)/error.shtml
PIXFILES = $(wildcard $(SRCDIR)/pix/*.jpg)
PIXFILES += $(wildcard $(SRCDIR)/pix/*.gif)
......
......@@ -32,9 +32,9 @@ if (!isset($exp_name) ||
}
#
# Only known and logged in users can begin experiments. Name came in as
# a POST var.
# Only known and logged in users can begin experiments.
#
$uid = GETLOGIN();
LOGGEDINORDIE($uid);
#
......@@ -141,9 +141,8 @@ chmod($tmpfname, 0666);
chmod($exp_nsfile, 0666);
echo "<center><br>";
echo "<h3>Starting batch experiment setup. Please wait a moment ...
</center><br><br>
</h3>";
echo "<h2>Starting batch experiment setup. Please wait a moment ...
</h2></center>";
flush();
......@@ -175,14 +174,19 @@ if ($retval) {
}
echo "</XMP>\n";
PAGEFOOTER();
die("");
}
echo "<center><br>";
echo "<h2>Experiment `$exp_id' in project `$exp_pid' has been batched!<br><br>
You will be notified via email when the experiment has been run<br>";
echo "</h2>";
echo "</center>\n";
echo "<br><br>";
echo "<h2>
Experiment `$exp_id' in project `$exp_pid' has been batched!<br><br>
Your experiment will be run when enough resources become available.
This might happen immediately, or it may take hours or days.
You will be notified via email when the experiment has been run.
If you do not receive email notification within a reasonable amount
of time, please contact $TBMAILADDR.
</h2>\n";
#
# Standard Testbed Footer
......
......@@ -45,15 +45,6 @@ if (mysql_num_rows($query_result) == 0) {
echo "<form enctype=\"multipart/form-data\"
action=\"batchexp.php3\" method=\"post\">\n";
#
# UID to feed back.
#
echo "<tr>
<td>*Username:</td>
<td class=\"left\">
<input type=\"readonly\" name=\"uid\" value=\"$uid\"></td>
</tr>\n";
#
# Select Project
#
......
......@@ -41,15 +41,6 @@ if (mysql_num_rows($query_result) == 0) {
echo "<form enctype=\"multipart/form-data\"
action=\"beginexp_process.php3\" method=\"post\">\n";
#
# UID to feed back.
#
echo "<tr>
<td>*Username:</td>
<td class=\"left\">
<input type=\"readonly\" name=\"uid\" value=\"$uid\"></td>
</tr>\n";
#
# Select Project
#
......
......@@ -36,9 +36,9 @@ if (!isset($exp_created) ||
}
#
# Only known and logged in users can begin experiments. Name came in as
# a POST var.
# Only known and logged in users can begin experiments.
#
$uid = GETLOGIN();
LOGGEDINORDIE($uid);
#
......@@ -210,9 +210,8 @@ if ($nonsfile) {
}
echo "<center><br>";
echo "<h3>Starting experiment configuration. Please wait a moment ...
</center><br><br>
</h3>";
echo "<h2>Starting experiment configuration. Please wait a moment ...
</h2></center>";
flush();
......@@ -260,15 +259,19 @@ if ($retval) {
$query_result = mysql_db_query($TBDBNAME,
"DELETE FROM experiments WHERE eid='$exp_id' and pid=\"$exp_pid\"");
PAGEFOOTER();
die("");
}
echo "<center><br>";
echo "<h2>Experiment `$exp_id' in project `$exp_pid' is configuring!<br><br>
You will be notified via email when the experiment has been fully<br>
configured and you are able to proceed.<br>";
echo "</h2>";
echo "</center>\n";
echo "<br><br>";
echo "<h3>
Experiment `$exp_id' in project `$exp_pid' is configuring!<br><br>
You will be notified via email when the experiment has been fully
configured and you are able to proceed. This typically takes less
than 10 minutes, depending on the number of nodes you have requested.
If you do not receive email notification within a reasonable amount
of time, please contact $TBMAILADDR.
</h3>\n";
#
# Standard Testbed Footer
......
......@@ -42,8 +42,11 @@ $THISHOMEBASE = "Emulab.Net";
$THISPROJECT = "The Utah Network Testbed";
#
# Links back to Flux web Pages
#
# This just spits out an email address in a page, so it does not need
# to be configured per development tree. It could be though ...
#
$TBMAILADDR = "<a href=\"mailto:testbed-ops@flux.cs.utah.edu\">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>";
#
# Database constants and the like.
......
......@@ -117,8 +117,7 @@ $gid = $row[0];
#
echo "<center><br>";
echo "<h3>Starting Batch Mode Experiment Cancelation. Please wait a moment ...
</center><br><br>
</h3>";
</h3></center>\n";
flush();
......@@ -143,10 +142,11 @@ if ($retval && $retval != 1) {
}
echo "</XMP>\n";
PAGEFOOTER();
die("");
}
echo "<center><h2><br>";
echo "<br><br><h2>
#
# Exit status 0 means cancelation was immediate.
# Exit status 1 means the experiment was running, and will terminate later.
......@@ -154,14 +154,16 @@ echo "<center><h2><br>";
if ($retval) {
echo "Cancelation has started<br><br>
You will be notified via email when the process has completed,
and you can reuse the experiment name.<br><br>
This might take a few minutes. Please be patient.\n";
and you can reuse the experiment name.
This typically takes less than 5 minutes.
If you do not receive email notification within a reasonable
amount of time, please contact $TBMAILADDR.\n";
}
else {
echo "Batchmode Experiment $exp_eid in project $exp_pid has
been canceled!\n";
}
echo "</center></h2>\n";
echo "</h2>\n";
#
# Standard Testbed Footer
......
......@@ -156,9 +156,8 @@ $gid = $row[0];
# tbstopit <pid> <eid>
#
echo "<center><br>";
echo "<h3>Starting experiment termination. Please wait a moment ...
</center><br><br>
</h3>";
echo "<h2>Starting experiment termination. Please wait a moment ...
</h2></center>";
flush();
......@@ -183,15 +182,19 @@ if ($retval) {
}
echo "</XMP>\n";
PAGEFOOTER();
die("");
}
echo "<center><br>";
echo "<h2>Experiment `$exp_eid' in project `$exp_pid' is terminating!<br><br>
You will be notified via email when the experiment has been torn<br>
down, and you can reuse the experiment name.<br>";
echo "</h2>";
echo "</center>\n";
echo "<br><br>";
echo "<h3>
Experiment `$exp_eid' in project `$exp_pid' is terminating!<br><br>
You will be notified via email when the experiment has been torn
down, and you can reuse the experiment name.
This typically takes less than 5 minutes.
If you do not receive email notification within a reasonable amount
of time, please contact $TBMAILADDR.
</h3>\n";
#
# Standard Testbed Footer
......
<html>
<head>
<title>Emulab.Net - Access Error</title>
</head>
<body bgcolor="#EEEEFF">
<basefont size=4>
<center>
<h2>
Access Error!
</h2>
</center>
<h3>
The URL you gave:
http://www.emulab.net<!--#echo var="REQUEST_URI" -->
is not available or is broken.
</h3>
Please contact
<a href="mailto:testbed-ops@fast.cs.utah.edu">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
if you didn't merely mis-type something.
<p>
</body>
</html>
......@@ -169,7 +169,7 @@ function WRITESIDEBAR() {
#
# Now the login/logout box. Remember, already inside a table.
#
echo "<form action=\"index.php3\" method=post>\n";
echo "<form action=\"${TBBASE}index.php3\" method=post>\n";
if ($login_status == $STATUS_LOGGEDIN) {
echo "<tr>
<td><input type=hidden name=uid value=\"$uid\"></td>
......@@ -440,7 +440,7 @@ function ENDPAGE() {
# Spit out a vanilla page footer.
#
function PAGEFOOTER() {
global $TBBASE;
global $TBBASE, $TBMAILADDR;
ENDPAGE();
......@@ -454,9 +454,8 @@ function PAGEFOOTER() {
</center>
<p align=right>
<font size=-2>
Problems? Contact
<a href=\"mailto:testbed-ops@flux.cs.utah.edu\">
Testbed Operations (testbed-ops@flux.cs.utah.edu)</a>
Problems? Contact $TBMAILADDR
</font>
</body>
</html>\n";
}
......
......@@ -56,6 +56,7 @@ if ($retval) {
}
echo "</XMP>\n";
PAGEFOOTER();
die("");
}
......
......@@ -7,8 +7,9 @@ include("defs.php3");
PAGEHEADER("Confirm Verification");
#
# Only known and logged in users can be verified. UID came in as a post var.
# Only known and logged in users can be verified.
#
$uid = GETLOGIN();
LOGGEDINORDIE($uid);
#
......
......@@ -12,25 +12,16 @@ PAGEHEADER("New User Verification");
$uid = GETLOGIN();
LOGGEDINORDIE($uid);
?>
<p>
The purpose of this page is to verify, for security purposes, that
information given in your application is correct. If you never
received a key at the email address given on your application, please
contact <a href="mailto:testbed-ops@flux.cs.utah.edu"> Testbed Ops
(testbed-ops@flux.cs.utah.edu)</a> for further assistance.
<p>
echo "<p><h3>
The purpose of this page is to verify, for security purposes, that
information given in your application is correct. If you never
received a key at the email address given on your application, please
contact $TBMAILADDR for further assistance.
</h3><p>\n";
<?php
echo "<table align=\"center\" border=\"1\">
<form action=\"verifyusr.php3\" method=\"post\">\n";
echo "<tr>
<td>Username:</td>
<td><input type=\"readonly\" name=\"uid\" value=\"$uid\"></td>
</tr>\n";
echo "<tr>
<td>Key:</td>
<td><input type=\"text\" name=\"key\" size=20></td>
......
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