Change all the signatures of email to generic "Testbed Operations"

www/approveproject.php3

@@ -96,8 +96,7 @@ elseif (strcmp($approval, "moreinfo") == 0) {
          "\n$message".
          "\n\n".
          "Thanks,\n".
-         "Testbed Ops\n".
-         "Utah Network Testbed\n",
+         "Testbed Operations\n",
          "From: $TBMAIL_APPROVAL\n".
          "Bcc: $TBMAIL_APPROVAL\n".
          "Errors-To: $TBMAIL_WWW");
@@ -128,8 +127,7 @@ elseif ((strcmp($approval, "deny") == 0) ||
          "\n$message".
          "\n\n".
          "Thanks,\n".
-         "Testbed Ops\n".
-         "Utah Network Testbed\n",
+         "Testbed Operations\n",
          "From: $TBMAIL_APPROVAL\n".
          "Bcc: $TBMAIL_APPROVAL\n".
          "Errors-To: $TBMAIL_WWW");
@@ -148,8 +146,7 @@ elseif ((strcmp($approval, "deny") == 0) ||
              "terminated because your project $pid was denied.\n".
              "\n\n".
              "Thanks,\n".
-             "Testbed Ops\n".
-             "Utah Network Testbed\n",
+             "Testbed Operations\n",
              "From: $TBMAIL_APPROVAL\n".
              "Bcc: $TBMAIL_APPROVAL\n".
              "Errors-To: $TBMAIL_WWW");
@@ -217,8 +214,7 @@ elseif (strcmp($approval, "approve") == 0) {
          "\n$message".
          "\n\n".
          "Thanks,\n".
-         "Testbed Ops\n".
-         "Utah Network Testbed\n",
+         "Testbed Operations\n",
          "From: $TBMAIL_APPROVAL\n".
          "Bcc: $TBMAIL_APPROVAL\n".
          "Errors-To: $TBMAIL_WWW");

www/approveuser.php3

@@ -372,8 +372,7 @@ while (list ($header, $value) = each ($HTTP_POST_VARS)) {
 	     "membership in project/group $project/$group.\n".
              "\n\n".
              "Thanks,\n".
-             "Testbed Ops\n".
-             "Utah Network Testbed\n",
+             "Testbed Operations\n",
              "From: $uid_name <$uid_email>\n".
              "Cc:  $phead_name <$phead_email>\n".
              "Bcc: $TBMAIL_AUDIT\n".
@@ -483,8 +482,7 @@ while (list ($header, $value) = each ($HTTP_POST_VARS)) {
 	     "$newtrust permissions.\n".
              "\n\n".
              "Thanks,\n".
-             "Testbed Ops\n".
-             "Utah Network Testbed\n",
+             "Testbed Operations\n",
              "From: $uid_name <$uid_email>\n".
              "Cc:  $phead_name <$phead_email>\n".
              "Bcc: $TBMAIL_AUDIT\n".

www/cdromnewkey.php

@@ -189,8 +189,7 @@ TBMAIL("$user_name <$user_email>",
        "This key is good for one installation, and will lapse after 12 hours.".
        "\n\n".
        "Thanks,\n".
-       "Testbed Ops\n".
-       "Utah Network Testbed\n",
+       "Testbed Operations\n",
        "From: $TBMAIL_OPS\n".
        "Bcc: $TBMAIL_AUDIT\n".
        "Errors-To: $TBMAIL_WWW");

www/deletepubkey.php3

@@ -124,8 +124,7 @@ TBMAIL("$targuid_name <$targuid_email>",
      "$chunky\n".
      "\n".
      "Thanks,\n".
-     "Testbed Ops\n".
-     "Utah Network Testbed\n",
+     "Testbed Operations\n",
      "From: $uid_name <$uid_email>\n".
      "Cc: $TBMAIL_AUDIT\n".
      "Errors-To: $TBMAIL_WWW");

www/deletesfskey.php3

@@ -125,8 +125,7 @@ TBMAIL("$targuid_name <$targuid_email>",
      "$chunky\n".
      "\n".
      "Thanks,\n".
-     "Testbed Ops\n".
-     "Utah Network Testbed\n",
+     "Testbed Operations\n",
      "From: $uid_name <$uid_email>\n".
      "Cc: $TBMAIL_AUDIT\n".
      "Errors-To: $TBMAIL_WWW");

www/joinproject.php3

@@ -597,8 +597,7 @@ if (! $returning) {
       "marked as an active user, and will be granted full access to your\n".
       "user account.\n\n".
       "Thanks,\n".
-      "Testbed Ops\n".
-      "Utah Network Testbed\n",
+      "Testbed Operations\n",
       "From: $TBMAIL_APPROVAL\n".
       "Bcc: $TBMAIL_AUDIT\n".
       "Errors-To: $TBMAIL_WWW");
@@ -662,8 +661,7 @@ if ($returning) {
 	   "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 Ops\n".
-	   "Utah Network Testbed\n",
+	   "Testbed Operations\n",
 	   "From: $TBMAIL_APPROVAL\n".
 	   "Bcc: $TBMAIL_AUDIT\n".
 	   "Errors-To: $TBMAIL_WWW");

www/moduserinfo.php3

@@ -487,8 +487,7 @@ TBMAIL("$usr_name <$usr_email>",
      "Password Changed?: $changed_password\n".
      "\n\n".
      "Thanks,\n".
-     "Testbed Ops\n".
-     "Utah Network Testbed\n",
+     "Testbed Operations\n",
      "From: $uid_name <$uid_email>\n".
      "Cc: $TBMAIL_AUDIT\n".
      "Errors-To: $TBMAIL_WWW");

www/newproject.php3

@@ -849,8 +849,7 @@ if (! $returning) {
       "as an active user and granted full access to your account.\n".
       "\n".
       "Thanks,\n".
-      "Testbed Ops\n".
-      "Utah Network Testbed\n",
+      "Testbed Operations\n",
       "From: $TBMAIL_APPROVAL\n".
       "Bcc: $TBMAIL_AUDIT\n".
       "Errors-To: $TBMAIL_WWW");

www/request_swapexp.php3

@@ -162,7 +162,7 @@ TBMAIL("$expleader_name <$expleader_email>",
      "$TBMAILADDR_OPS.\n".
      "\n".
      "Thanks!\n".
-     "Utah Network Testbed\n",
+     "Testbed Operations\n",
      "From: $TBMAIL_OPS\n".
      ( $swap_requests >= $tell_proj_head
        ? "Cc: $projleader_name <$projleader_email>\n"

www/showproject_list.php3

@@ -28,7 +28,7 @@ $isadmin = ISADMIN($uid);
 if (!isset($splitview) || !$isadmin)
     $splitview = 0;
 if (!isset($sortby))
-    $sortby = "name";
+    $sortby = "pid";
 
 if ($isadmin) {
     if (! $splitview) {
@@ -58,7 +58,7 @@ elseif (! strcmp($sortby, "running"))
 elseif (! strcmp($sortby, "nodes"))
     $order = "ncount DESC";
 else 
-    $order = "p.name";
+    $order = "p.pid";
 
 if ($isadmin) {
     $query_result =

www/showsfskeys.php3

@@ -293,8 +293,7 @@ TBMAIL("$targuid_name <$targuid_email>",
      "$chunky\n".
      "\n".
      "Thanks,\n".
-     "Testbed Ops\n".
-     "Utah Network Testbed\n",
+     "Testbed Operations\n",
      "From: $uid_name <$uid_email>\n".
      "Cc: $TBMAIL_AUDIT\n".
      "Errors-To: $TBMAIL_WWW");

www/verifyusr.php3

@@ -115,8 +115,7 @@ function INFORMLEADERS($uid) {
 		"your decision regarding $usr_name's membership in your\n".
 		"project.\n\n".
 		"Thanks,\n".
-		"Testbed Ops\n".
-		"Utah Network Testbed\n",
+		"Testbed Operations\n",
 		"From: $TBMAIL_APPROVAL\n".
 		"Bcc: $TBMAIL_AUDIT\n".
 		"Errors-To: $TBMAIL_WWW");
@@ -133,7 +132,7 @@ if (strcmp($status, TBDB_USERSTATUS_UNVERIFIED) == 0) {
 	   "User '$uid' has been verified.\n".
            "Status has been changed from 'unverified' to 'active'\n".
 	   "\n".
-	   "Testbed Ops\n",
+	   "Testbed Operations\n",
 	   "From: $TBMAIL_OPS\n".
 	   "Errors-To: $TBMAIL_WWW");
 
@@ -152,7 +151,7 @@ elseif (strcmp($status, TBDB_USERSTATUS_NEWUSER) == 0) {
 	   "User '$uid' has been verified.\n".
            "Status has been changed from 'newuser' to 'unapproved'\n".
 	   "\n".
-	   "Testbed Ops\n",
+	   "Testbed Operations\n",
 	   "From: $TBMAIL_OPS\n".
 	   "Errors-To: $TBMAIL_WWW");