UnitySite::redirect is not static

Author: simonLeary42

resources/lib/UnitySite.php

@@ -6,7 +6,8 @@
 
 class UnitySite
 {
-    public static function redirect($destination)
+    // not static because it is mocked during testing
+    public function redirect($destination)
     {
         if ($_SERVER["PHP_SELF"] != $destination) {
             header("Location: $destination");

resources/templates/header.php

@@ -1,10 +1,9 @@
 <?php
 
-use UnityWebPortal\lib\UnitySite;
-
 if (isset($SSO)) {
     if (!$_SESSION["user_exists"]) {
-        UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
+        $site = new UnityWebPortal\lib\UnitySite();
+        $site->redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
     }
 }
 
@@ -119,7 +118,8 @@
     if (isset($_SESSION["is_admin"]) && $_SESSION["is_admin"]) {
         if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST["form_name"]) && $_POST["form_name"] == "clearView") {
             unset($_SESSION["viewUser"]);
-            UnitySite::redirect($CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
+            $site = new UnityWebPortal\lib\UnitySite();
+            $site->redirect($CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
         }
 
         if (isset($_SESSION["viewUser"])) {
@@ -135,4 +135,4 @@
             echo "</div>";
         }
     }
-    ?>
+    ?>

webroot/admin/user-mgmt.php

@@ -2,8 +2,6 @@
 
 require_once __DIR__ . "/../../resources/autoload.php";
 
-use UnityWebPortal\lib\UnitySite;
-
 if (!$USER->isAdmin()) {
     throw new Exception("access denied");
 }
@@ -12,7 +10,8 @@
     switch ($_POST["form_name"]) {
         case "viewAsUser":
             $_SESSION["viewUser"] = $_POST["uid"];
-            UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/account.php");
+            $site = new UnityWebPortal\lib\UnitySite();
+            $site->redirect($CONFIG["site"]["prefix"] . "/panel/account.php");
             break;
     }
 }

webroot/panel/new_account.php

@@ -2,13 +2,13 @@
 
 require_once __DIR__ . "/../../resources/autoload.php";
 
-use UnityWebPortal\lib\UnitySite;
 use UnityWebPortal\lib\UnityGroup;
 
 require_once $LOC_HEADER;
 
 if ($USER->exists()) {
-    UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/index.php");  // Redirect if account already exists
+    $site = new UnityWebPortal\lib\UnitySite();
+    $site->redirect($CONFIG["site"]["prefix"] . "/panel/index.php");  // Redirect if account already exists
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {