Commit b5049538 authored by Jay Lepreau's avatar Jay Lepreau

Testbed Control -> Testbed Ops (sounds less domineering)

plastic -> emulab
a few nits
parent edc36c2f
<?php
include("defs.php3");
echo "<html>
<head>
<title>Joining a project</title>
......@@ -159,11 +160,11 @@ if (isset($pid)) { #add a project to the database
"Testbed username $uid and email address $usr_email.\n$usr_name's ".
"phone number is $usr_phone and address $usr_addr.\n".
"\nPlease return ".
"to <https://plastic.cs.utah.edu/tbdb.html>, log in,\nand select the ".
"to $TBWWW, log in,\nand select the ".
"'New User Approval' page to enter your decision regarding\n".
"$usr_name's membership in your project".
"\n\nThanks,\nTestbed Control\nUtah Network Testbed\n",
"From: Testbed Control <testbed-control@flux.cs.utah.edu>\n".
"\n\nThanks,\nTestbed Ops\nUtah Network Testbed\n",
"From: Testbed Ops <testbed-ops@flux.cs.utah.edu>\n".
"Cc: Testbed WWW <testbed-www@flux.cs.utah.edu>\n".
"Errors-To: Testbed WWW <testbed-www@flux.cs.utah.edu>");
if ($newuser==1) {
......@@ -172,7 +173,7 @@ if (isset($pid)) { #add a project to the database
"Network Testbed. As promised,\nhere is your key to verify your ".
"account. Your key is:\n\n".
crypt("TB_".$uid."_USR",strlen($uid)+13)."\n\n\t Please ".
"return to <https://plastic.cs.utah.edu/tbdb.html> and log in,\n".
"return to $TBWWW and log in,\n".
"using the user name and password you gave us when you applied. ".
"You will\nthen find an option on the menu called ".
"'New User Verification'. Select it,\nand on that page enter in ".
......@@ -180,8 +181,8 @@ if (isset($pid)) { #add a project to the database
"verified as a user. When you have been ".
"both verified and\napproved by the head of your project, you will be ".
"marked as an active user,\nand will be granted full access to your ".
"user account.\n\nThanks,\nTestbed Control\nUtah Network Testbed\n",
"From: Testbed Control <testbed-control@flux.cs.utah.edu>\n".
"user account.\n\nThanks,\nTestbed Ops\nUtah Network Testbed\n",
"From: Testbed Ops <testbed-ops@flux.cs.utah.edu>\n".
"Cc: Testbed WWW <testbed-www@flux.cs.utah.edu>\n".
"Errors-To: Testbed WWW <testbed-www@flux.cs.utah.edu>");
echo "
......
......@@ -94,8 +94,8 @@ while ($row = mysql_fetch_row($found)) {
"\nThis message is to notify you that you have been approved ".
"as a member of \nthe $gid group with $trust permissions.\n".
"\nYour status as a Testbed user is now $newstatus.".
"\n\nThanks,\nTestbed Control\nUtah Network Testbed\n",
"From: Testbed Control <testbed-control@flux.cs.utah.edu>\n".
"\n\nThanks,\nTestbed Ops\nUtah Network Testbed\n",
"From: Testbed Ops <testbed-ops@flux.cs.utah.edu>\n".
"Cc: Testbed WWW <testbed-www@flux.cs.utah.edu>\n".
"Errors-To: Testbed WWW <testbed-www@flux.cs.utah.edu>");
echo "<h3><p>User $uid was changed to status $newstatus and ";
......@@ -113,8 +113,8 @@ while ($row = mysql_fetch_row($found)) {
"\nThis message is to notify you that you have been denied ".
"as a member of \nthe $gid group.\n".
"\nYour status as a Testbed user is still $status.".
"\n\nThanks,\nTestbed Control\nUtah Network Testbed\n",
"From: Testbed Control <testbed-control@flux.cs.utah.edu>\n".
"\n\nThanks,\nTestbed Ops\nUtah Network Testbed\n",
"From: Testbed Ops <testbed-ops@flux.cs.utah.edu>\n".
"Cc: Testbed WWW <testbed-www@flux.cs.utah.edu>\n".
"Errors-To: Testbed WWW <testbed-www@flux.cs.utah.edu>");
echo "<h3><p>User $uid was denied membership in your group.</p></h3>\n";
......
......@@ -2,8 +2,8 @@
#
# Standard definitions!
#
$TBWWW = "<https://plastic.cs.utah.edu/tbdb.html>";
$TBMAIL_CONTROL = "Testbed Control <testbed-control@flux.cs.utah.edu>";
$TBWWW = "<https://www.emulab.net/tbdb.html>";
$TBMAIL_CONTROL = "Testbed Ops <testbed-ops@flux.cs.utah.edu>";
$TBMAIL_WWW = "Testbed WWW <testbed-www@flux.cs.utah.edu>";
$TBMAIL_APPROVE = "Testbed Approval <testbed-approval@flux.cs.utah.edu>";
$TBDBNAME = "tbdb";
......
......@@ -179,7 +179,7 @@ if (! $returning) {
"be marked as an active user, and will be granted full access to\n".
"your user account.\n\n".
"Thanks,\n".
"Testbed Control\n".
"Testbed Ops\n".
"Utah Network Testbed\n",
"From: $TBMAIL_CONTROL\n".
"Cc: $TBMAIL_WWW\n".
......@@ -191,7 +191,7 @@ if (! $returning) {
# * Bump the unix GID.
# * Create a new group in the database.
# * Create a new group_membership entry in the database, default trust=none.
# * Generate a mail message to testbed control
# * Generate a mail message to testbed ops.
#
$unixgid_query = "SELECT unix_gid FROM groups ORDER BY unix_gid DESC";
$unixgid_result = mysql_db_query($TBDBNAME, $unixgid_query);
......@@ -226,7 +226,7 @@ mail($TBMAIL_APPROVAL,
"Affiliation:\t$grp_affil\nAddress:\t$grp_addr\n".
"Phone:\t\t$usr_phones\n\n".
"Reasons:\n$why\n\nPlease review the application and when you have\n".
"made a decision, go to <https://plastic.cs.utah.edu/tbdb.html> and\n".
"made a decision, go to $TBWWW and\n".
"select the 'Group Approval' page.\n\nThey are expecting a result ".
"within 72 hours.\n",
"From: $usr_name <$email>\n".
......
......@@ -2,7 +2,7 @@
<head>
<title>Utah Network Testbed</title>
<link rel='stylesheet' href='tbstyle.css' type='text/css'>
<base href='https://plastic.cs.utah.edu/' target='dynamic'>
<base href='https://www.emulab.net/' target='dynamic'>
</head>
<body>
<a href="welcome.html"><h3>Utah Network Testbed</h3></a>
......@@ -110,8 +110,8 @@ if (isset($auth_usr)) {
} elseif ($status == "unapproved") {
echo "Your account has not been approved yet. Please try back ";
echo "later. Contact ";
echo "<a href=\"mailto:testbed-control@flux.cs.utah.edu\">";
echo "Testbed Control (testbed-control@flux.cs.utah.edu)</a>";
echo "<a href=\"mailto:testbed-ops@flux.cs.utah.edu\">";
echo "Testbed ops (testbed-ops@flux.cs.utah.edu)</a>";
echo " for further assistance.\n";
} elseif (($status == "newuser") || ($status == "unverified")) {
echo "<A href='verify.php3?$auth_usr'>New User Verification</A>\n";
......@@ -119,8 +119,8 @@ if (isset($auth_usr)) {
echo "Your account has been changed to status $status, and is ";
echo "currently unusable. Please contact your group leader to find out ";
echo "why. If you need further help, contact ";
echo "<a href=\"mailto:testbed-control@flux.cs.utah.edu\">";
echo "Testbed Control (testbed-control@flux.cs.utah.edu)</a>.";
echo "<a href=\"mailto:testbed-ops@flux.cs.utah.edu\">";
echo "Testbed Ops (testbed-ops@flux.cs.utah.edu)</a>.";
}
}
?>
......
......@@ -158,7 +158,7 @@ if (! $returning) {
"be marked as an active user, and will be granted full access to\n".
"your user account.\n\n".
"Thanks,\n".
"Testbed Control\n".
"Testbed Ops\n".
"Utah Network Testbed\n",
"From: $TBMAIL_CONTROL\n".
"Cc: $TBMAIL_WWW\n".
......@@ -232,7 +232,7 @@ mail("$group_leader_email",
"log in, and select the 'New User Approval' page to enter your\n".
"decision regarding $usr_name's membership in your project\n\n".
"Thanks,\n".
"Testbed Control\n".
"Testbed Ops\n".
"Utah Network Testbed\n",
"From: $TBMAIL_CONTROL\n".
"Cc: $TBMAIL_WWW\n".
......
......@@ -71,8 +71,8 @@ if (isset($uid) && isset($pswd) && isset($key)) {
} else {
echo "<h3>You have already been verified, $uid. If you did not ".
"perform this verification, please notify ".
"<a href=\"mailto:testbed-control@flux.cs.utah.edu\">".
"Testbed Control (testbed-control@flux.cs.utah.edu)</a> immediately.</h3>\n";
"<a href=\"mailto:testbed-ops@flux.cs.utah.edu\">".
"Testbed Ops (testbed-ops@flux.cs.utah.edu)</a> immediately.</h3>\n";
}
} else {
echo "<h3>The given password is incorrect. Please go back to ".
......@@ -90,14 +90,10 @@ if (isset($uid) && isset($pswd) && isset($key)) {
"enter the correct password and key.</h3>\n";
}
?>
<p>Please contact
<a href="mailto:testbed-control@flux.cs.utah.edu">Testbed Control
(testbed-control@flux.cs.utah.edu)</a>
<p>Please contact
<a href="mailto:testbed-ops@flux.cs.utah.edu">
Testbed Ops (testbed-ops@flux.cs.utah.edu)</a>
if you need further assistance.
</p>
</body>
</html>
......@@ -39,8 +39,8 @@ Please log in again.</h3>\n</body></html>";
<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-control@flux.cs.utah.edu">
Testbed Control (testbed-control@flux.cs.utah.edu)</a>
<a href="mailto:testbed-ops@flux.cs.utah.edu">
Testbed Ops (testbed-ops@flux.cs.utah.edu)</a>
for further assistance.
</p>
<?php
......
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