UnitySite not static

Author: simonLeary42

resources/init.php

@@ -13,6 +13,7 @@
 use UnityWebPortal\lib\UnityRedis;
 use UnityWebPortal\lib\UnityWebhook;
 use UnityWebPortal\lib\UnityGithub;
+use UnityWebPortal\lib\UnitySite;
 
 //
 // Initialize Session
@@ -125,6 +126,8 @@
     }
 }
 
+$SITE = new UnitySite();
+
 //
 // Define vars
 //

resources/lib/UnitySite.php

@@ -6,15 +6,15 @@
 
 class UnitySite
 {
-    public static function redirect($destination)
+    public function redirect($destination)
     {
         if ($_SERVER["PHP_SELF"] != $destination) {
             header("Location: $destination");
             die("Redirect failed, click <a href='$destination'>here</a> to continue.");
         }
     }
 
-    public static function removeTrailingWhitespace($arr)
+    public function removeTrailingWhitespace($arr)
     {
         $out = array();
         foreach ($arr as $str) {
@@ -25,7 +25,7 @@ public static function removeTrailingWhitespace($arr)
         return $out;
     }
 
-    public static function testValidSSHKey($key_str)
+    public function testValidSSHKey($key_str)
     {
         // key loader still throws, these just mute warnings for phpunit
         // https://github.com/phpseclib/phpseclib/issues/2079

resources/templates/header.php

@@ -1,10 +1,7 @@
 <?php
-
-use UnityWebPortal\lib\UnitySite;
-
 if (isset($SSO)) {
     if (!$_SESSION["user_exists"]) {
-        UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
+        $SITE->redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
     }
 }
 
@@ -119,7 +116,7 @@
     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->redirect($CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
         }
 
         if (isset($_SESSION["viewUser"])) {
@@ -135,4 +132,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,7 @@
     switch ($_POST["form_name"]) {
         case "viewAsUser":
             $_SESSION["viewUser"] = $_POST["uid"];
-            UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel");
+            $SITE->redirect($CONFIG["site"]["prefix"] . "/panel");
             break;
     }
 }

webroot/js/ajax/ssh_validate.php

@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . "/../../../resources/lib/UnitySite.php";
-require_once __DIR__ . "/../../../vendor/autoload.php";
+require_once __DIR__ . "/../../../resources/autoload.php";
 
-echo UnityWebPortal\lib\UnitySite::testValidSSHKey($_POST["key"]) ? "true" : "false";
+echo $SITE->testValidSSHKey($_POST["key"]) ? "true" : "false";

webroot/panel/account.php

@@ -2,8 +2,6 @@
 
 require_once __DIR__ . "/../../resources/autoload.php";
 
-use UnityWebPortal\lib\UnitySite;
-
 require_once $LOC_HEADER;
 
 $invalid_ssh_dialogue = "<script type='text/javascript'>
@@ -18,7 +16,7 @@
             switch ($_POST["add_type"]) {
                 case "paste":
                     $key = $_POST["key"];
-                    if (UnitySite::testValidSSHKey($key)) {
+                    if ($SITE->testValidSSHKey($key)) {
                         array_push($added_keys, $key);
                     } else {
                         echo $invalid_ssh_dialogue;
@@ -27,7 +25,7 @@
                 case "import":
                     $keyfile = $_FILES["keyfile"]["tmp_name"];
                     $key = file_get_contents($keyfile);
-                    if (UnitySite::testValidSSHKey($key)) {
+                    if ($SITE->testValidSSHKey($key)) {
                         array_push($added_keys, $key);
                     } else {
                         echo $invalid_ssh_dialogue;
@@ -40,15 +38,15 @@
                     $gh_user = $_POST["gh_user"];
                     $keys = $GITHUB->getSshPublicKeys($gh_user);
                     foreach ($keys as $key) {
-                        if (UnitySite::testValidSSHKey($key)) {
+                        if ($SITE->testValidSSHKey($key)) {
                             array_push($added_keys, $key);
                         }
                     }
                     break;
             }
 
             if (!empty($added_keys)) {
-                $added_keys = UnitySite::removeTrailingWhitespace($added_keys);
+                $added_keys = $SITE->removeTrailingWhitespace($added_keys);
                 $totalKeys = array_merge($USER->getSSHKeys(), $added_keys);
                 $USER->setSSHKeys($totalKeys, $OPERATOR);
             }

webroot/panel/index.php

@@ -2,6 +2,4 @@
 
 require "../../resources/autoload.php";
 
-use UnityWebPortal\lib\UnitySite;
-
-UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/account.php");
+$SITE->redirect($CONFIG["site"]["prefix"] . "/panel/account.php");

webroot/panel/new_account.php

@@ -2,13 +2,12 @@
 
 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->redirect($CONFIG["site"]["prefix"] . "/panel/index.php");  // Redirect if account already exists
 }
 
 if ($_SERVER["REQUEST_METHOD"] == "POST") {

webroot/panel/pi.php

@@ -3,7 +3,6 @@
 require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnityUser;
-use UnityWebPortal\lib\UnitySite;
 
 $group = $USER->getPIGroup();