Some fixups

    Use UnitySite::redirect instead of doing it ourselves
    Move special logic from UnitySite::redirect to header.php
    Fix PI checkbox being required by default

Author: bryank-cs

resources/lib/UnitySite.php

@@ -26,10 +26,8 @@ public static function die($x = null)
 
     public static function redirect($destination)
     {
-        if ($_SERVER["PHP_SELF"] != $destination) {
-            header("Location: $destination");
-            self::die("Redirect failed, click <a href='$destination'>here</a> to continue.");
-        }
+        header("Location: $destination");
+        die("Redirect failed, click <a href='$destination'>here</a> to continue.");
     }
 
     private static function headerResponseCode(int $code, string $reason)

resources/templates/header.php

@@ -11,7 +11,7 @@
 }
 
 if (isset($SSO)) {
-    if (!$_SESSION["user_exists"]) {
+    if (!$_SESSION["user_exists"] && !str_ends_with($_SERVER['PHP_SELF'], "/panel/new_account.php")) {
         UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
     }
 }

webroot/panel/new_account.php

@@ -39,8 +39,7 @@
             $form_group->newUserRequest($USER);
         }
     }
-    header("Location: {$_SERVER['PHP_SELF']}");
-    UnitySite::die();
+    UnitySite::redirect($_SERVER['PHP_SELF']);
 }
 
 if (isset($_GET['cancel']) && count($pending_requests) > 0) {
@@ -56,8 +55,7 @@
             $pi_group->cancelGroupJoinRequest($user=$USER);
         }
     }
-    header("Location: {$_SERVER['PHP_SELF']}");
-    UnitySite::die();
+    UnitySite::redirect($_SERVER['PHP_SELF']);
 }
 
 ?>
@@ -74,7 +72,7 @@
             echo "<p>Requesting a PI account</p>";
             echo "<p>You will receive an email when your account has been approved.</p>";
             echo "<p>Email <a href=\"mailto:{$CONFIG['mail']['support']}\">{$CONFIG['mail']['support_name']}</a>";
-            echo "if you have not heard back in one business day. </p>";
+            echo " if you have not heard back in one business day. </p>";
         } else {
             $owner_uid = UnityGroup::getUIDfromPIUID($pi_uid);
             echo "<p>Joining existing group owned by " . $owner_uid . "</p>";
@@ -100,7 +98,7 @@
 
         <label><input type='radio' name='new_user_sel' value='pi'>Request a PI account</label>
         <div style='position: relative;display: none;' id='piConfirmWrapper'>
-        <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree' required>
+        <label><input type='checkbox' id='chk_pi' name='confirm_pi' value='agree'>
            I have read the PI <a href="<?php echo $CONFIG["site"]["account_policy_url"]; ?>">
             account policy</a> guidelines. </label>
         </div>