From d8407d05e62da00bc68380c3cb5a58f9368840c0 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 11:01:10 -0400
Subject: [PATCH 01/11] make CONFIG a constant

---
 resources/autoload.php          |  2 +-
 resources/config.php            |  5 +++
 resources/init.php              | 77 ++++++++++++++++-----------------
 resources/templates/footer.php  | 22 +++++-----
 resources/templates/header.php  | 34 +++++++--------
 test/phpunit-bootstrap.php      |  6 +--
 webroot/admin/content.php       |  2 +-
 webroot/admin/pi-mgmt.php       |  2 +-
 webroot/admin/user-mgmt.php     |  2 +-
 webroot/index.php               |  2 +-
 webroot/panel/account.php       |  4 +-
 webroot/panel/groups.php        | 10 ++---
 webroot/panel/modal/new_key.php |  6 +--
 webroot/panel/modal/new_pi.php  |  4 +-
 webroot/panel/new_account.php   | 12 ++---
 webroot/panel/pi.php            |  2 +-
 webroot/panel/support.php       |  2 +-
 workers/update-ldap-cache.php   |  6 +--
 18 files changed, 102 insertions(+), 98 deletions(-)
 create mode 100644 resources/config.php

diff --git a/resources/autoload.php b/resources/autoload.php
index 0942efc6..2eb533a1 100644
--- a/resources/autoload.php
+++ b/resources/autoload.php
@@ -26,5 +26,5 @@
 require_once __DIR__ . "/lib/UnityGithub.php";
 require_once __DIR__ . "/lib/exceptions/SSOException.php";
 
-// run init script
+require_once __DIR__ . "/config.php";
 require __DIR__ . "/init.php";
diff --git a/resources/config.php b/resources/config.php
new file mode 100644
index 00000000..ac43e9ed
--- /dev/null
+++ b/resources/config.php
@@ -0,0 +1,5 @@
+<?php
+
+use UnityWebPortal\lib\UnityConfig;
+
+define("CONFIG", UnityConfig::getConfig(__DIR__ . "/../defaults", __DIR__ . "/../deployment"));
diff --git a/resources/init.php b/resources/init.php
index b2b883c7..d35bf884 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -4,7 +4,6 @@
  * init.php - Initialization script that is run on every page of Unity
  */
 
-use UnityWebPortal\lib\UnityConfig;
 use UnityWebPortal\lib\UnityLDAP;
 use UnityWebPortal\lib\UnityMailer;
 use UnityWebPortal\lib\UnitySQL;
@@ -18,65 +17,63 @@
 
 session_start();
 
-$CONFIG = UnityConfig::getConfig(__DIR__ . "/../defaults", __DIR__ . "/../deployment");
-
 $REDIS = new UnityRedis(
-    $CONFIG["redis"]["host"] ?? "",
-    $CONFIG["redis"]["port"] ?? ""
+    CONFIG["redis"]["host"] ?? "",
+    CONFIG["redis"]["port"] ?? ""
 );
 
 if (isset($GLOBALS["ldapconn"])) {
     $LDAP = $GLOBALS["ldapconn"];
 } else {
     $LDAP = new UnityLDAP(
-        $CONFIG["ldap"]["uri"],
-        $CONFIG["ldap"]["user"],
-        $CONFIG["ldap"]["pass"],
+        CONFIG["ldap"]["uri"],
+        CONFIG["ldap"]["user"],
+        CONFIG["ldap"]["pass"],
         __DIR__ . "/../deployment/custom_user_mappings",
-        $CONFIG["ldap"]["basedn"],
-        $CONFIG["ldap"]["user_ou"],
-        $CONFIG["ldap"]["group_ou"],
-        $CONFIG["ldap"]["pigroup_ou"],
-        $CONFIG["ldap"]["orggroup_ou"],
-        $CONFIG["ldap"]["admin_group"],
-        $CONFIG["ldap"]["user_group"],
-        $CONFIG["ldap"]["def_user_shell"]
+        CONFIG["ldap"]["basedn"],
+        CONFIG["ldap"]["user_ou"],
+        CONFIG["ldap"]["group_ou"],
+        CONFIG["ldap"]["pigroup_ou"],
+        CONFIG["ldap"]["orggroup_ou"],
+        CONFIG["ldap"]["admin_group"],
+        CONFIG["ldap"]["user_group"],
+        CONFIG["ldap"]["def_user_shell"]
     );
     $GLOBALS["ldapconn"] = $LDAP;
 }
 
 $SQL = new UnitySQL(
-    $CONFIG["sql"]["host"],
-    $CONFIG["sql"]["dbname"],
-    $CONFIG["sql"]["user"],
-    $CONFIG["sql"]["pass"]
+    CONFIG["sql"]["host"],
+    CONFIG["sql"]["dbname"],
+    CONFIG["sql"]["user"],
+    CONFIG["sql"]["pass"]
 );
 
 $MAILER = new UnityMailer(
     __DIR__ . "/mail",
     __DIR__ . "/../deployment/mail_overrides",
-    $CONFIG["smtp"]["host"],
-    $CONFIG["smtp"]["port"],
-    $CONFIG["smtp"]["security"],
-    $CONFIG["smtp"]["user"],
-    $CONFIG["smtp"]["pass"],
-    $CONFIG["smtp"]["ssl_verify"],
-    $CONFIG["site"]["url"] . $CONFIG["site"]["prefix"],
-    $CONFIG["mail"]["sender"],
-    $CONFIG["mail"]["sender_name"],
-    $CONFIG["mail"]["support"],
-    $CONFIG["mail"]["support_name"],
-    $CONFIG["mail"]["admin"],
-    $CONFIG["mail"]["admin_name"],
-    $CONFIG["mail"]["pi_approve"],
-    $CONFIG["mail"]["pi_approve_name"]
+    CONFIG["smtp"]["host"],
+    CONFIG["smtp"]["port"],
+    CONFIG["smtp"]["security"],
+    CONFIG["smtp"]["user"],
+    CONFIG["smtp"]["pass"],
+    CONFIG["smtp"]["ssl_verify"],
+    CONFIG["site"]["url"] . CONFIG["site"]["prefix"],
+    CONFIG["mail"]["sender"],
+    CONFIG["mail"]["sender_name"],
+    CONFIG["mail"]["support"],
+    CONFIG["mail"]["support_name"],
+    CONFIG["mail"]["admin"],
+    CONFIG["mail"]["admin_name"],
+    CONFIG["mail"]["pi_approve"],
+    CONFIG["mail"]["pi_approve_name"]
 );
 
 $WEBHOOK = new UnityWebhook(
     __DIR__ . "/mail",
     __DIR__ . "/../deployment/mail_overrides",
-    $CONFIG["webhook"]["url"],
-    $CONFIG["site"]["url"] . $CONFIG["site"]["prefix"]
+    CONFIG["webhook"]["url"],
+    CONFIG["site"]["url"] . CONFIG["site"]["prefix"]
 );
 
 $GITHUB = new UnityGithub();
@@ -89,7 +86,9 @@
         $eppn = $_SERVER["REMOTE_USER"];
         UnitySite::errorLog("SSO Failure", "{$e} ($errorid)");
         UnitySite::die(
-            "Invalid eppn: '$eppn'. Please contact {$CONFIG["mail"]["support"]} (id: $errorid)",
+            "Invalid eppn: '$eppn'. Please contact support at "
+                . CONFIG["mail"]["support"]
+                . " (id: $errorid)",
             true
         );
     }
@@ -106,7 +105,7 @@
 
     $_SESSION["user_exists"] = $USER->exists();
     $_SESSION["is_pi"] = $USER->isPI();
-    $SEND_PIMESG_TO_ADMINS = $CONFIG["mail"]["send_pimesg_to_admins"];
+    $SEND_PIMESG_TO_ADMINS = CONFIG["mail"]["send_pimesg_to_admins"];
 
     $SQL->addLog(
         $OPERATOR->uid,
diff --git a/resources/templates/footer.php b/resources/templates/footer.php
index 9c74c223..e5cd3d2c 100644
--- a/resources/templates/footer.php
+++ b/resources/templates/footer.php
@@ -4,13 +4,13 @@
   <div id="footerLogos">
     <?php
 
-    $footer_logos = $CONFIG["footer"]["logos"];
-    $footer_links = $CONFIG["footer"]["links"];
-    $footer_titles = $CONFIG["footer"]["title"];
+    $footer_logos = CONFIG["footer"]["logos"];
+    $footer_links = CONFIG["footer"]["links"];
+    $footer_titles = CONFIG["footer"]["title"];
     for ($i = 0; $i < count($footer_logos); $i++) {
         echo
         "<a target='_blank' href='" . $footer_links[$i] . "'>
-        <img src='" . $CONFIG["site"]["prefix"] . "/assets/" . $footer_logos[$i] . "'
+        <img src='" . CONFIG["site"]["prefix"] . "/assets/" . $footer_logos[$i] . "'
         draggable='false' title='" . $footer_titles[$i] . "'></a>";
     }
     ?>
@@ -19,20 +19,20 @@
   <div class="footerBlock">
     <span>
         Unity Web Portal Version
-        <a target="_blank" href="<?php echo $CONFIG["upstream"]["repo"]; ?>">
-            <?php echo $CONFIG["upstream"]["version"]; ?>
+        <a target="_blank" href="<?php echo CONFIG["upstream"]["repo"]; ?>">
+            <?php echo CONFIG["upstream"]["version"]; ?>
         </a>
     </span>
     &nbsp;|
-    <a href="<?php echo $CONFIG["site"]["terms_of_service_url"]; ?>">Terms of Service</a>
+    <a href="<?php echo CONFIG["site"]["terms_of_service_url"]; ?>">Terms of Service</a>
   </div>
 </footer>
 
 </body>
 
-<script src="<?php echo $CONFIG["site"]["prefix"]; ?>/js/filter.js"></script>
-<script src="<?php echo $CONFIG["site"]["prefix"]; ?>/js/sort.js"></script>
-<script src="<?php echo $CONFIG["site"]["prefix"]; ?>/js/global.js"></script>
-<script src="<?php echo $CONFIG["site"]["prefix"]; ?>/js/tables.js"></script>
+<script src="<?php echo CONFIG["site"]["prefix"]; ?>/js/filter.js"></script>
+<script src="<?php echo CONFIG["site"]["prefix"]; ?>/js/sort.js"></script>
+<script src="<?php echo CONFIG["site"]["prefix"]; ?>/js/global.js"></script>
+<script src="<?php echo CONFIG["site"]["prefix"]; ?>/js/tables.js"></script>
 
 </html>
diff --git a/resources/templates/header.php b/resources/templates/header.php
index adb42b3a..496c79f1 100644
--- a/resources/templates/header.php
+++ b/resources/templates/header.php
@@ -8,7 +8,7 @@
         && (@$_POST["form_type"] ?? null) == "clearView"
     ) {
         unset($_SESSION["viewUser"]);
-        UnitySite::redirect($CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
+        UnitySite::redirect(CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
     }
     // Webroot files need to handle their own POSTs before loading the header
     // so that they can do UnitySite::badRequest before anything else has been printed.
@@ -16,7 +16,7 @@
     // header also needs to handle POST data. So this header does the PRG redirect
     // for all pages.
     unset($_POST); // unset ensures that header must not come before POST handling
-    UnitySite::redirect($CONFIG["site"]["prefix"] . $_SERVER['REQUEST_URI']);
+    UnitySite::redirect(CONFIG["site"]["prefix"] . $_SERVER['REQUEST_URI']);
 }
 
 if (isset($SSO)) {
@@ -24,7 +24,7 @@
         !$_SESSION["user_exists"]
         && !str_ends_with($_SERVER['PHP_SELF'], "/panel/new_account.php")
     ) {
-        UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/new_account.php");
+        UnitySite::redirect(CONFIG["site"]["prefix"] . "/panel/new_account.php");
     }
 }
 
@@ -41,7 +41,7 @@
     <?php
     // set global css variables from branding
     echo ":root {";
-    foreach ($CONFIG["colors"] as $var_name => $var_value) {
+    foreach (CONFIG["colors"] as $var_name => $var_value) {
         echo "--$var_name: $var_value;";
     }
     echo "}";
@@ -49,7 +49,7 @@
   </style>
 
   <?php
-    $prefix = $CONFIG["site"]["prefix"];
+    $prefix = CONFIG["site"]["prefix"];
     echo "
         <link rel='stylesheet' type='text/css' href='$prefix/css/global.css'>
         <link rel='stylesheet' type='text/css' href='$prefix/css/navbar.css'>
@@ -60,20 +60,20 @@
     ?>
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="<?php echo $CONFIG["site"]["description"] ?>">
+  <meta name="description" content="<?php echo CONFIG["site"]["description"] ?>">
 
-  <title><?php echo $CONFIG["site"]["name"]; ?></title>
+  <title><?php echo CONFIG["site"]["name"]; ?></title>
 </head>
 
 <body>
 
   <header>
     <img id="imgLogo" draggable=false
-    src="<?php echo $CONFIG["site"]["prefix"]; ?>/assets/<?php echo $CONFIG["site"]["logo"]; ?>">
+    src="<?php echo CONFIG["site"]["prefix"]; ?>/assets/<?php echo CONFIG["site"]["logo"]; ?>">
     <button class="hamburger vertical-align">
       <img
         draggable="false"
-        src="<?php echo $CONFIG["site"]["prefix"]; ?>/assets/menu.png"
+        src="<?php echo CONFIG["site"]["prefix"]; ?>/assets/menu.png"
         alt="Menu Button"
       >
     </button>
@@ -81,14 +81,14 @@
 
   <nav class="mainNav">
     <?php
-    $prefix = $CONFIG["site"]["prefix"];
+    $prefix = CONFIG["site"]["prefix"];
     // Public Items - Always Visible
     echo "<a href='$prefix/index.php'>Home</a>";
 
-    $num_additional_items = count($CONFIG["menuitems"]["labels"]);
+    $num_additional_items = count(CONFIG["menuitems"]["labels"]);
     for ($i = 0; $i < $num_additional_items; $i++) {
-        echo "<a target='_blank' href='" . $CONFIG["menuitems"]["links"][$i] . "'>" .
-        $CONFIG["menuitems"]["labels"][$i] . "</a>";
+        echo "<a target='_blank' href='" . CONFIG["menuitems"]["links"][$i] . "'>" .
+        CONFIG["menuitems"]["labels"][$i] . "</a>";
     }
 
     if (isset($_SESSION["user_exists"]) && $_SESSION["user_exists"]) {
@@ -103,10 +103,10 @@
         }
 
         // additional branding items
-        $num_additional_items = count($CONFIG["menuitems_secure"]["labels"]);
+        $num_additional_items = count(CONFIG["menuitems_secure"]["labels"]);
         for ($i = 0; $i < $num_additional_items; $i++) {
-            echo "<a target='_blank' href='" . $CONFIG["menuitems_secure"]["links"][$i] . "'>" .
-            $CONFIG["menuitems_secure"]["labels"][$i] . "</a>";
+            echo "<a target='_blank' href='" . CONFIG["menuitems_secure"]["links"][$i] . "'>" .
+            CONFIG["menuitems_secure"]["labels"][$i] . "</a>";
         }
 
         // admin pages
@@ -145,7 +145,7 @@
       </div>
     </div>
   </div>
-  <script src="<?php echo $CONFIG["site"]["prefix"]; ?>/js/modal.js"></script>
+  <script src="<?php echo CONFIG["site"]["prefix"]; ?>/js/modal.js"></script>
 
   <main>
 
diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
index 6aba6af2..4fe54777 100644
--- a/test/phpunit-bootstrap.php
+++ b/test/phpunit-bootstrap.php
@@ -64,7 +64,7 @@ function switchUser(
     string $mail,
     string|null $session_id = null
 ): void {
-    global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;
+    global $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;
     session_write_close();
     if (is_null($session_id)) {
         session_id(str_replace(["_", "@", "."], "-", uniqid($eppn . "_")));
@@ -83,7 +83,7 @@ function switchUser(
 
 function http_post(string $phpfile, array $post_data): void
 {
-    global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;
+    global $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;
     $_PREVIOUS_SERVER = $_SERVER;
     $_SERVER["REQUEST_METHOD"] = "POST";
     $_SERVER["PHP_SELF"] = preg_replace("/.*webroot\//", "/", $phpfile);
@@ -106,7 +106,7 @@ function http_post(string $phpfile, array $post_data): void
 
 function http_get(string $phpfile, array $get_data = array()): void
 {
-    global $CONFIG, $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;
+    global $REDIS, $LDAP, $SQL, $MAILER, $WEBHOOK, $GITHUB, $SITE, $SSO, $OPERATOR, $USER, $SEND_PIMESG_TO_ADMINS, $LOC_HEADER, $LOC_FOOTER;
     $_PREVIOUS_SERVER = $_SERVER;
     $_SERVER["REQUEST_METHOD"] = "GET";
     $_SERVER["PHP_SELF"] = preg_replace("/.*webroot\//", "/", $phpfile);
diff --git a/webroot/admin/content.php b/webroot/admin/content.php
index d0821e07..9cab5ba8 100644
--- a/webroot/admin/content.php
+++ b/webroot/admin/content.php
@@ -51,7 +51,7 @@
         .catch(error => {
             console.error(error)
         });
-    const prefix = '<?php echo $CONFIG["site"]["prefix"]; ?>';
+    const prefix = '<?php echo CONFIG["site"]["prefix"]; ?>';
     $("#pageForm > select[name=pageSel]").change(function(e) {
         $.ajax({
             url: `${prefix}/admin/ajax/get_page_contents.php?pageid=` + $(this).val(),
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
index efcf798f..86edbd0a 100644
--- a/webroot/admin/pi-mgmt.php
+++ b/webroot/admin/pi-mgmt.php
@@ -135,7 +135,7 @@ class="filterSearch"
         }
     });
 
-    var ajax_url = "<?php echo $CONFIG["site"]["prefix"]; ?>/admin/ajax/get_group_members.php?gid=";
+    var ajax_url = "<?php echo CONFIG["site"]["prefix"]; ?>/admin/ajax/get_group_members.php?gid=";
 </script>
 
 <?php
diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
index b3c3e84d..0ef5694d 100644
--- a/webroot/admin/user-mgmt.php
+++ b/webroot/admin/user-mgmt.php
@@ -12,7 +12,7 @@
     switch ($_POST["form_type"]) {
         case "viewAsUser":
             $_SESSION["viewUser"] = $_POST["uid"];
-            UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/account.php");
+            UnitySite::redirect(CONFIG["site"]["prefix"] . "/panel/account.php");
             break;
     }
 }
diff --git a/webroot/index.php b/webroot/index.php
index 921f4d81..119263e2 100644
--- a/webroot/index.php
+++ b/webroot/index.php
@@ -7,7 +7,7 @@
 
 
 <?php
-echo $SQL->getPage($CONFIG["page"]["home"])["content"];
+echo $SQL->getPage(CONFIG["page"]["home"])["content"];
 ?>
 
 <h1>Cluster Notices</h1>
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
index 7eac043f..d8a51c93 100644
--- a/webroot/panel/account.php
+++ b/webroot/panel/account.php
@@ -204,7 +204,7 @@
     <input type="hidden" name="form_type" value="loginshell" />
     <select id="loginSelector" class="code" name="shellSelect">
 ';
-foreach ($CONFIG["loginshell"]["shell"] as $shell) {
+foreach (CONFIG["loginshell"]["shell"] as $shell) {
     echo "<option>$shell</option>";
 }
 echo "
@@ -243,7 +243,7 @@
 ?>
 
 <script>
-    const sitePrefix = '<?php echo $CONFIG["site"]["prefix"]; ?>';
+    const sitePrefix = '<?php echo CONFIG["site"]["prefix"]; ?>';
     const ldapLoginShell = '<?php echo $USER->getLoginShell(); ?>';
 
     $("button.btnAddKey").click(function() {
diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php
index b86872f9..aeb8cd2f 100644
--- a/webroot/panel/groups.php
+++ b/webroot/panel/groups.php
@@ -114,14 +114,14 @@
     echo "
         You are only a member of your own PI group.
         Navigate to the
-        <a href='" . $CONFIG["site"]["prefix"] . "/panel/pi.php'>my users</a>
+        <a href='" . CONFIG["site"]["prefix"] . "/panel/pi.php'>my users</a>
         page to see your group.
     ";
 }
 
 if (count($PIGroupGIDs) == 0) {
     echo "You are not a member of any groups. Request to join a PI using the button below,
-    or request your own PI account on the <a href='" . $CONFIG["site"]["prefix"] .
+    or request your own PI account on the <a href='" . CONFIG["site"]["prefix"] .
         "/panel/account.php'>account settings</a> page";
 }
 
@@ -171,7 +171,7 @@
 
 <script>
     $("button.btnAddPI").click(function () {
-        openModal("Add New PI", "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/modal/new_pi.php");
+        openModal("Add New PI", "<?php echo CONFIG["site"]["prefix"]; ?>/panel/modal/new_pi.php");
     });
 
     <?php
@@ -183,12 +183,12 @@
         }
 
         echo "openModal('Add New PI', '" .
-            $CONFIG["site"]["prefix"] . "/panel/modal/new_pi.php', '" . $errorHTML . "');";
+            CONFIG["site"]["prefix"] . "/panel/modal/new_pi.php', '" . $errorHTML . "');";
     }
     ?>
 
     // tables.js uses ajax_url to populate expandable tables
-    var ajax_url = "<?php echo $CONFIG["site"]["prefix"]; ?>/panel/ajax/get_group_members.php?gid=";
+    var ajax_url = "<?php echo CONFIG["site"]["prefix"]; ?>/panel/ajax/get_group_members.php?gid=";
 </script>
 
 <style>
diff --git a/webroot/panel/modal/new_key.php b/webroot/panel/modal/new_key.php
index 486dddf8..c8909fe0 100644
--- a/webroot/panel/modal/new_key.php
+++ b/webroot/panel/modal/new_key.php
@@ -4,7 +4,7 @@
 ?>
 
 <form id="newKeyform" enctype="multipart/form-data" method="POST"
-action="<?php echo $CONFIG["site"]["prefix"]; ?>/panel/account.php">
+action="<?php echo CONFIG["site"]["prefix"]; ?>/panel/account.php">
     <input type='hidden' name='form_type' value='addKey'>
 
     <div class='inline'>
@@ -69,7 +69,7 @@ function generateKey(type) {
         var endingSection = "</section>";
 
         $.ajax({
-            url: "<?php echo $CONFIG["site"]["prefix"]; ?>/js/ajax/ssh_generate.php?type=" + type,
+            url: "<?php echo CONFIG["site"]["prefix"]; ?>/js/ajax/ssh_generate.php?type=" + type,
             success: function(result) {
                 var pubKey = result.substr(result.indexOf(pubSection) + pubSection.length,
                 result.indexOf(endingSection) - result.indexOf(pubSection) - pubSection.length);
@@ -98,7 +98,7 @@ function generateKey(type) {
     $("textarea[name=key]").on("input", function() {
         var key = $(this).val();
         $.ajax({
-            url: "<?php echo $CONFIG["site"]["prefix"]; ?>/js/ajax/ssh_validate.php",
+            url: "<?php echo CONFIG["site"]["prefix"]; ?>/js/ajax/ssh_validate.php",
             type: "POST",
             data: {
                 key: key
diff --git a/webroot/panel/modal/new_pi.php b/webroot/panel/modal/new_pi.php
index 9394be5e..53368e96 100644
--- a/webroot/panel/modal/new_pi.php
+++ b/webroot/panel/modal/new_pi.php
@@ -6,7 +6,7 @@
 <form
     id="newPIform"
     method="POST"
-    action="<?php echo $CONFIG["site"]["prefix"]; ?>/panel/groups.php"
+    action="<?php echo CONFIG["site"]["prefix"]; ?>/panel/groups.php"
 >
     <input type="hidden" name="form_type" value="addPIform">
     <div style="position: relative;">
@@ -19,7 +19,7 @@
 <script>
     $("input[type=text][name=pi]").keyup(function() {
         var searchWrapper = $("div.searchWrapper");
-        const prefix = '<?php echo $CONFIG["site"]["prefix"]; ?>';
+        const prefix = '<?php echo CONFIG["site"]["prefix"]; ?>';
         $.ajax({
             url: `${prefix}/panel/modal/pi_search.php?search=` + $(this).val(),
             success: function(result) {
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
index 4c1038f8..953b93e9 100644
--- a/webroot/panel/new_account.php
+++ b/webroot/panel/new_account.php
@@ -7,7 +7,7 @@
 use UnityWebPortal\lib\UnitySQL;
 
 if ($USER->exists()) {
-    UnitySite::redirect($CONFIG["site"]["prefix"] . "/panel/account.php");
+    UnitySite::redirect(CONFIG["site"]["prefix"] . "/panel/account.php");
 }
 
 $pending_requests = $SQL->getRequestsByUser($USER->uid);
@@ -92,8 +92,8 @@
         <p>You will receive an email when your account has been approved.</p>
         <p>
         <?php
-        $addr = "mailto:" . $CONFIG['mail']['support'];
-        $name = $CONFIG['mail']['support_name'];
+        $addr = "mailto:" . CONFIG['mail']['support'];
+        $name = CONFIG['mail']['support_name'];
         echo "Email <a href='$addr'>$name</a> if you have not heard back in one business day.";
         ?>
         </p>
@@ -137,14 +137,14 @@
 
         <div style='position: relative;display: none;' id='piConfirmWrapper'>
         <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"]; ?>">
+           I have read the PI <a href="<?php echo CONFIG["site"]["account_policy_url"]; ?>">
             account policy</a> guidelines. </label>
         </div>
         <br>
 
         <label><input type='checkbox' id='chk_eula' name='eula' value='agree' required>
             I have read and accept the
-            <a target='_blank' href='<?php echo $CONFIG["site"]["terms_of_service_url"]; ?>'>
+            <a target='_blank' href='<?php echo CONFIG["site"]["terms_of_service_url"]; ?>'>
                 Unity Terms of Service
             </a>.
         </label>
@@ -172,7 +172,7 @@
 
     $("input[type=text][name=pi]").keyup(function() {
         var searchWrapper = $("div.searchWrapper");
-        const prefix = '<?php echo $CONFIG["site"]["prefix"]; ?>';
+        const prefix = '<?php echo CONFIG["site"]["prefix"]; ?>';
         $.ajax({
             url: `${prefix}/panel/modal/pi_search.php?search=` + $(this).val(),
             success: function(result) {
diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
index 32ccdbb3..a177ae0c 100644
--- a/webroot/panel/pi.php
+++ b/webroot/panel/pi.php
@@ -45,7 +45,7 @@
 
 if (count($requests) + count($assocs) == 1) {
     echo "<p>You do not have any users attached to your PI account.
-    Ask your users to request to join your account on the <a href='" . $CONFIG["site"]["prefix"] .
+    Ask your users to request to join your account on the <a href='" . CONFIG["site"]["prefix"] .
         "/panel/groups.php'>My PIs</a> page.</p>";
 }
 
diff --git a/webroot/panel/support.php b/webroot/panel/support.php
index 8454cba2..e3c7e8dd 100644
--- a/webroot/panel/support.php
+++ b/webroot/panel/support.php
@@ -9,7 +9,7 @@
 <hr>
 
 <?php
-echo $SQL->getPage($CONFIG["page"]["support"])["content"];
+echo $SQL->getPage(CONFIG["page"]["support"])["content"];
 ?>
 
 <?php
diff --git a/workers/update-ldap-cache.php b/workers/update-ldap-cache.php
index a079295b..45756e11 100755
--- a/workers/update-ldap-cache.php
+++ b/workers/update-ldap-cache.php
@@ -35,7 +35,7 @@
 
     // search entire tree, some users created for admin purposes might not be in the normal OU
     echo "waiting for LDAP search (users)...\n";
-    $users = $LDAP->search("objectClass=posixAccount", $CONFIG["ldap"]["basedn"], []);
+    $users = $LDAP->search("objectClass=posixAccount", CONFIG["ldap"]["basedn"], []);
     echo "response received.\n";
     $user_CNs = $LDAP->getUserGroup()->getAttribute("memberuid");
     sort($user_CNs);
@@ -54,7 +54,7 @@
         $REDIS->setCache($uid, "homedir", $user->getAttribute("homedirectory")[0]);
     }
 
-    $org_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["orggroup_ou"]);
+    $org_group_ou = new LDAPEntry($LDAP->getConn(), CONFIG["ldap"]["orggroup_ou"]);
     echo "waiting for LDAP search (org groups)...\n";
     $org_groups = $org_group_ou->getChildrenArray(["cn", "memberuid"], true);
     echo "response received.\n";
@@ -68,7 +68,7 @@
         $REDIS->setCache($gid, "members", (@$org_group["memberuid"] ?? []));
     }
 
-    $pi_group_ou = new LDAPEntry($LDAP->getConn(), $CONFIG["ldap"]["pigroup_ou"]);
+    $pi_group_ou = new LDAPEntry($LDAP->getConn(), CONFIG["ldap"]["pigroup_ou"]);
     echo "waiting for LDAP search (pi groups)...\n";
     $pi_groups = $pi_group_ou->getChildrenArray(["cn", "memberuid"], true);
     echo "response received.\n";

From 39ccc9937c740d1c73bb86a6871ea78a2ef98fe1 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 11:18:58 -0400
Subject: [PATCH 02/11] remove dependency injection for UnityLDAP, UnityRedis

---
 resources/init.php           | 20 ++---------
 resources/lib/UnityLDAP.php  | 64 +++++++++---------------------------
 resources/lib/UnityRedis.php |  4 ++-
 3 files changed, 21 insertions(+), 67 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index d35bf884..b35ef215 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -17,28 +17,12 @@
 
 session_start();
 
-$REDIS = new UnityRedis(
-    CONFIG["redis"]["host"] ?? "",
-    CONFIG["redis"]["port"] ?? ""
-);
+$REDIS = new UnityRedis();
 
 if (isset($GLOBALS["ldapconn"])) {
     $LDAP = $GLOBALS["ldapconn"];
 } else {
-    $LDAP = new UnityLDAP(
-        CONFIG["ldap"]["uri"],
-        CONFIG["ldap"]["user"],
-        CONFIG["ldap"]["pass"],
-        __DIR__ . "/../deployment/custom_user_mappings",
-        CONFIG["ldap"]["basedn"],
-        CONFIG["ldap"]["user_ou"],
-        CONFIG["ldap"]["group_ou"],
-        CONFIG["ldap"]["pigroup_ou"],
-        CONFIG["ldap"]["orggroup_ou"],
-        CONFIG["ldap"]["admin_group"],
-        CONFIG["ldap"]["user_group"],
-        CONFIG["ldap"]["def_user_shell"]
-    );
+    $LDAP = new UnityLDAP();
     $GLOBALS["ldapconn"] = $LDAP;
 }
 
diff --git a/resources/lib/UnityLDAP.php b/resources/lib/UnityLDAP.php
index e34ff6e3..3c22de77 100644
--- a/resources/lib/UnityLDAP.php
+++ b/resources/lib/UnityLDAP.php
@@ -24,13 +24,7 @@ class UnityLDAP extends ldapConn
     "top"
     );
 
-    // string vars for OUs
-    private $STR_BASEOU;
-    private $STR_USEROU;
-    private $STR_GROUPOU;
-    private $STR_PIGROUPOU;
-    private $STR_ORGGROUPOU;
-    private $STR_ADMINGROUP;
+    private $custom_mappings_path = __DIR__ . "/../../deployment/custom_user_mappings";
 
     // Instance vars for various ldapEntry objects
     private $baseOU;
@@ -40,45 +34,19 @@ class UnityLDAP extends ldapConn
     private $org_groupOU;
     private $adminGroup;
     private $userGroup;
-
-    private $custom_mappings_path;
-
     private $def_user_shell;
 
-    public function __construct(
-        $host,
-        $dn,
-        $pass,
-        $custom_user_mappings,
-        $base_ou,
-        $user_ou,
-        $group_ou,
-        $pigroup_ou,
-        $orggroup_ou,
-        $admin_group,
-        $user_group_dn,
-        $def_user_shell
-    ) {
-        parent::__construct($host, $dn, $pass);
-
-        $this->STR_BASEOU = $base_ou;
-        $this->STR_USEROU = $user_ou;
-        $this->STR_GROUPOU = $group_ou;
-        $this->STR_PIGROUPOU = $pigroup_ou;
-        $this->STR_ORGGROUPOU = $orggroup_ou;
-        $this->STR_ADMINGROUP = $admin_group;
-
-        $this->baseOU = $this->getEntry($base_ou);
-        $this->userOU = $this->getEntry($user_ou);
-        $this->groupOU = $this->getEntry($group_ou);
-        $this->pi_groupOU = $this->getEntry($pigroup_ou);
-        $this->org_groupOU = $this->getEntry($orggroup_ou);
-        $this->adminGroup = $this->getEntry($admin_group);
-        $this->userGroup = $this->getEntry($user_group_dn);
-
-        $this->custom_mappings_path = $custom_user_mappings;
-
-        $this->def_user_shell = $def_user_shell;
+    public function __construct()
+    {
+        parent::__construct(CONFIG["ldap"]["uri"], CONFIG["ldap"]["user"], CONFIG["ldap"]["pass"]);
+        $this->baseOU = $this->getEntry(CONFIG["ldap"]["basedn"]);
+        $this->userOU = $this->getEntry(CONFIG["ldap"]["user_ou"]);
+        $this->groupOU = $this->getEntry(CONFIG["ldap"]["group_ou"]);
+        $this->pi_groupOU = $this->getEntry(CONFIG["ldap"]["pigroup_ou"]);
+        $this->org_groupOU = $this->getEntry(CONFIG["ldap"]["orggroup_ou"]);
+        $this->adminGroup = $this->getEntry(CONFIG["ldap"]["admin_group"]);
+        $this->userGroup = $this->getEntry(CONFIG["ldap"]["user_group"]);
+        $this->def_user_shell = CONFIG["ldap"]["def_user_shell"];
     }
 
     public function getUserOU()
@@ -429,24 +397,24 @@ public function getAllOrgGroupsAttributes($attributes)
     public function getUserEntry($uid)
     {
         $uid = ldap_escape($uid, "", LDAP_ESCAPE_DN);
-        return $this->getEntry(unityLDAP::RDN . "=$uid," . $this->STR_USEROU);
+        return $this->getEntry(unityLDAP::RDN . "=$uid," . CONFIG["ldap"]["user_ou"]);
     }
 
     public function getGroupEntry($gid)
     {
         $gid = ldap_escape($gid, "", LDAP_ESCAPE_DN);
-        return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_GROUPOU);
+        return $this->getEntry(unityLDAP::RDN . "=$gid," . CONFIG["ldap"]["group_ou"]);
     }
 
     public function getPIGroupEntry($gid)
     {
         $gid = ldap_escape($gid, "", LDAP_ESCAPE_DN);
-        return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_PIGROUPOU);
+        return $this->getEntry(unityLDAP::RDN . "=$gid," . CONFIG["ldap"]["pigroup_ou"]);
     }
 
     public function getOrgGroupEntry($gid)
     {
         $gid = ldap_escape($gid, "", LDAP_ESCAPE_DN);
-        return $this->getEntry(unityLDAP::RDN . "=$gid," . $this->STR_ORGGROUPOU);
+        return $this->getEntry(unityLDAP::RDN . "=$gid," . CONFIG["ldap"]["orggroup_ou"]);
     }
 }
diff --git a/resources/lib/UnityRedis.php b/resources/lib/UnityRedis.php
index 5a467445..2f2bd9c9 100644
--- a/resources/lib/UnityRedis.php
+++ b/resources/lib/UnityRedis.php
@@ -11,8 +11,10 @@ class UnityRedis
 
     private $enabled;
 
-    public function __construct($host, $port)
+    public function __construct()
     {
+        $host = CONFIG["redis"]["host"] ?? "";
+        $port = CONFIG["redis"]["port"] ?? "";
         if (empty($host)) {
             $this->enabled = false;
         } else {

From 059b4f6f7aff52df19295c4fb0b50e54670a86bc Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 11:22:16 -0400
Subject: [PATCH 03/11] remove dependency injection from UnitySQL

---
 resources/init.php         | 7 +------
 resources/lib/UnitySQL.php | 8 ++++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index b35ef215..894dc1e3 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -26,12 +26,7 @@
     $GLOBALS["ldapconn"] = $LDAP;
 }
 
-$SQL = new UnitySQL(
-    CONFIG["sql"]["host"],
-    CONFIG["sql"]["dbname"],
-    CONFIG["sql"]["user"],
-    CONFIG["sql"]["pass"]
-);
+$SQL = new UnitySQL();
 
 $MAILER = new UnityMailer(
     __DIR__ . "/mail",
diff --git a/resources/lib/UnitySQL.php b/resources/lib/UnitySQL.php
index f623c895..dad0e0bd 100644
--- a/resources/lib/UnitySQL.php
+++ b/resources/lib/UnitySQL.php
@@ -24,9 +24,13 @@ class UnitySQL
 
     private $conn;
 
-    public function __construct($db_host, $db, $db_user, $db_pass)
+    public function __construct()
     {
-        $this->conn = new PDO("mysql:host=" . $db_host . ";dbname=" . $db, $db_user, $db_pass);
+        $this->conn = new PDO(
+            "mysql:host=" . CONFIG["sql"]["host"] . ";dbname=" . CONFIG["sql"]["dbname"],
+            CONFIG["sql"]["user"],
+            CONFIG["sql"]["pass"]
+        );
         $this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
 

From 474abb2da37b02d00a883c9e5cf0a7dffed92096 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 11:34:24 -0400
Subject: [PATCH 04/11] remove dependency injection from UnityMailer

---
 resources/init.php            | 20 +--------
 resources/lib/UnityMailer.php | 78 +++++++++++------------------------
 2 files changed, 25 insertions(+), 73 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index 894dc1e3..906b658c 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -28,25 +28,7 @@
 
 $SQL = new UnitySQL();
 
-$MAILER = new UnityMailer(
-    __DIR__ . "/mail",
-    __DIR__ . "/../deployment/mail_overrides",
-    CONFIG["smtp"]["host"],
-    CONFIG["smtp"]["port"],
-    CONFIG["smtp"]["security"],
-    CONFIG["smtp"]["user"],
-    CONFIG["smtp"]["pass"],
-    CONFIG["smtp"]["ssl_verify"],
-    CONFIG["site"]["url"] . CONFIG["site"]["prefix"],
-    CONFIG["mail"]["sender"],
-    CONFIG["mail"]["sender_name"],
-    CONFIG["mail"]["support"],
-    CONFIG["mail"]["support_name"],
-    CONFIG["mail"]["admin"],
-    CONFIG["mail"]["admin_name"],
-    CONFIG["mail"]["pi_approve"],
-    CONFIG["mail"]["pi_approve_name"]
-);
+$MAILER = new UnityMailer();
 
 $WEBHOOK = new UnityWebhook(
     __DIR__ . "/mail",
diff --git a/resources/lib/UnityMailer.php b/resources/lib/UnityMailer.php
index c976f30f..d9edfe6b 100644
--- a/resources/lib/UnityMailer.php
+++ b/resources/lib/UnityMailer.php
@@ -10,51 +10,34 @@
  */
 class UnityMailer extends PHPMailer
 {
-    private $template_dir;  // location of all email templates
-    private $override_template_dir;
-
-    private $MSG_LINKREF;
-    private $MSG_SENDER_EMAIL;
-    private $MSG_SENDER_NAME;
-    private $MSG_SUPPORT_EMAIL;
-    private $MSG_SUPPORT_NAME;
-    private $MSG_ADMIN_EMAIL;
-    private $MSG_ADMIN_NAME;
-    private $MSG_PI_APPROVAL_EMAIL;
-    private $MSG_PI_APPROVAL_NAME;
-
-    public function __construct(
-        $template_dir,
-        $override_template_dir,
-        $hostname,
-        $port,
-        $security,
-        $user,
-        $pass,
-        $ssl_verify,
-        $msg_linkref,
-        $msg_sender_email,
-        $msg_sender_name,
-        $msg_support_email,
-        $msg_support_name,
-        $msg_admin_email,
-        $msg_admin_name,
-        $msg_pi_approval_email,
-        $msg_pi_approval_name
-    ) {
+    private $template_dir = __DIR__ . "/../mail"; // location of all email templates
+    private $override_template_dir = __DIR__ . "/../../deployment/mail_overrides";
+    private $MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"];
+    private $MSG_SENDER_EMAIL = CONFIG["mail"]["sender"];
+    private $MSG_SENDER_NAME = CONFIG["mail"]["sender_name"];
+    private $MSG_SUPPORT_EMAIL = CONFIG["mail"]["support"];
+    private $MSG_SUPPORT_NAME = CONFIG["mail"]["support_name"];
+    private $MSG_ADMIN_EMAIL = CONFIG["mail"]["admin"];
+    private $MSG_ADMIN_NAME = CONFIG["mail"]["admin_name"];
+    private $MSG_PI_APPROVAL_EMAIL = CONFIG["mail"]["pi_approve"];
+    private $MSG_PI_APPROVAL_NAME = CONFIG["mail"]["pi_approve_name"];
+
+    public function __construct()
+    {
         parent::__construct();
         $this->isSMTP();
 
-        if (empty($hostname)) {
+        if (empty(CONFIG["smtp"]["host"])) {
             throw new Exception("SMTP server hostname not set");
         }
-        $this->Host = $hostname;
+        $this->Host = CONFIG["smtp"]["host"];
 
-        if (empty($port)) {
+        if (empty(CONFIG["smtp"]["port"])) {
             throw new Exception("SMTP server port not set");
         }
-        $this->Port = $port;
+        $this->Port = CONFIG["smtp"]["port"];
 
+        $security = CONFIG["smtp"]["security"];
         $security_conf_valid = empty($security) || $security == "tls" || $security == "ssl";
         if (!$security_conf_valid) {
             throw new Exception(
@@ -63,18 +46,18 @@ public function __construct(
         }
         $this->SMTPSecure = $security;
 
-        if (!empty($user)) {
+        if (!empty(CONFIG["smtp"]["user"])) {
             $this->SMTPAuth = true;
-            $this->Username = $user;
+            $this->Username = CONFIG["smtp"]["user"];
         } else {
             $this->SMTPAuth = false;
         }
 
-        if (!empty($pass)) {
-            $this->Password = $pass;
+        if (!empty(CONFIG["smtp"]["pass"])) {
+            $this->Password = CONFIG["smtp"]["pass"];
         }
 
-        if ($ssl_verify == "false") {
+        if (CONFIG["smtp"]["ssl_verify"] == "false") {
             $this->SMTPOptions = array(
                 'ssl' => array(
                     'verify_peer' => false,
@@ -83,19 +66,6 @@ public function __construct(
                 )
             );
         }
-
-        $this->template_dir = $template_dir;
-        $this->override_template_dir = $override_template_dir;
-
-        $this->MSG_LINKREF = $msg_linkref;
-        $this->MSG_SENDER_EMAIL = $msg_sender_email;
-        $this->MSG_SENDER_NAME = $msg_sender_name;
-        $this->MSG_SUPPORT_EMAIL = $msg_support_email;
-        $this->MSG_SUPPORT_NAME = $msg_support_name;
-        $this->MSG_ADMIN_EMAIL = $msg_admin_email;
-        $this->MSG_ADMIN_NAME = $msg_admin_name;
-        $this->MSG_PI_APPROVAL_EMAIL = $msg_pi_approval_email;
-        $this->MSG_PI_APPROVAL_NAME = $msg_pi_approval_name;
     }
 
     public function sendMail($recipients, $template = null, $data = null)

From 37a66221b596673d30df7454905729ce3639bff6 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 11:36:44 -0400
Subject: [PATCH 05/11] remove dependency injection from UnityWebhook

---
 resources/init.php             |  7 +------
 resources/lib/UnityWebhook.php | 20 ++++----------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index 906b658c..3ed2063c 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -30,12 +30,7 @@
 
 $MAILER = new UnityMailer();
 
-$WEBHOOK = new UnityWebhook(
-    __DIR__ . "/mail",
-    __DIR__ . "/../deployment/mail_overrides",
-    CONFIG["webhook"]["url"],
-    CONFIG["site"]["url"] . CONFIG["site"]["prefix"]
-);
+$WEBHOOK = new UnityWebhook();
 
 $GITHUB = new UnityGithub();
 
diff --git a/resources/lib/UnityWebhook.php b/resources/lib/UnityWebhook.php
index c2fd5749..8d4f0fa1 100644
--- a/resources/lib/UnityWebhook.php
+++ b/resources/lib/UnityWebhook.php
@@ -4,24 +4,12 @@
 
 class UnityWebhook
 {
-    private $template_dir;
-    private $override_template_dir;
-    private $url;
-    private $MSG_LINKREF;
+    private $template_dir = __DIR__ . "/../mail";
+    private $override_template_dir = __DIR__ . "/../../deployment/mail_overrides";
+    private $url = CONFIG["webhook"]["url"];
+    private $MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"];
     private $Subject; // set by template
 
-    public function __construct(
-        $template_dir,
-        $override_template_dir,
-        $url,
-        $msg_linkref
-    ) {
-        $this->template_dir = $template_dir;
-        $this->override_template_dir = $override_template_dir;
-        $this->url = $url;
-        $this->MSG_LINKREF = $msg_linkref;
-    }
-
     public function htmlToMarkdown($html)
     {
         // Define regex patterns for each markdown format

From 2a6240e41b8c747f0785eda3dc26df337541c3be Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 11:37:21 -0400
Subject: [PATCH 06/11] remove empty lines

---
 resources/init.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/resources/init.php b/resources/init.php
index 3ed2063c..c56c3d48 100644
--- a/resources/init.php
+++ b/resources/init.php
@@ -18,20 +18,15 @@
 session_start();
 
 $REDIS = new UnityRedis();
-
 if (isset($GLOBALS["ldapconn"])) {
     $LDAP = $GLOBALS["ldapconn"];
 } else {
     $LDAP = new UnityLDAP();
     $GLOBALS["ldapconn"] = $LDAP;
 }
-
 $SQL = new UnitySQL();
-
 $MAILER = new UnityMailer();
-
 $WEBHOOK = new UnityWebhook();
-
 $GITHUB = new UnityGithub();
 
 if (isset($_SERVER["REMOTE_USER"])) {  // Check if SSO is enabled on this page

From 205a9334364b2485bd711663f633d9ba999a471b Mon Sep 17 00:00:00 2001
From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com>
Date: Wed, 10 Sep 2025 11:52:03 -0400
Subject: [PATCH 07/11] Update resources/lib/UnityWebhook.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 resources/lib/UnityWebhook.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/lib/UnityWebhook.php b/resources/lib/UnityWebhook.php
index 8d4f0fa1..3f479eb2 100644
--- a/resources/lib/UnityWebhook.php
+++ b/resources/lib/UnityWebhook.php
@@ -7,9 +7,13 @@ class UnityWebhook
     private $template_dir = __DIR__ . "/../mail";
     private $override_template_dir = __DIR__ . "/../../deployment/mail_overrides";
     private $url = CONFIG["webhook"]["url"];
-    private $MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"];
+    private $MSG_LINKREF;
     private $Subject; // set by template
 
+    public function __construct()
+    {
+        $this->MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"];
+    }
     public function htmlToMarkdown($html)
     {
         // Define regex patterns for each markdown format

From 7cd6b8ae762aa31c73a6315041b92ea5b0c16c5c Mon Sep 17 00:00:00 2001
From: simonLeary42 <71396965+simonLeary42@users.noreply.github.com>
Date: Wed, 10 Sep 2025 11:52:11 -0400
Subject: [PATCH 08/11] Update resources/lib/UnityMailer.php

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 resources/lib/UnityMailer.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/resources/lib/UnityMailer.php b/resources/lib/UnityMailer.php
index d9edfe6b..cd141e19 100644
--- a/resources/lib/UnityMailer.php
+++ b/resources/lib/UnityMailer.php
@@ -12,21 +12,30 @@ class UnityMailer extends PHPMailer
 {
     private $template_dir = __DIR__ . "/../mail"; // location of all email templates
     private $override_template_dir = __DIR__ . "/../../deployment/mail_overrides";
-    private $MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"];
-    private $MSG_SENDER_EMAIL = CONFIG["mail"]["sender"];
-    private $MSG_SENDER_NAME = CONFIG["mail"]["sender_name"];
-    private $MSG_SUPPORT_EMAIL = CONFIG["mail"]["support"];
-    private $MSG_SUPPORT_NAME = CONFIG["mail"]["support_name"];
-    private $MSG_ADMIN_EMAIL = CONFIG["mail"]["admin"];
-    private $MSG_ADMIN_NAME = CONFIG["mail"]["admin_name"];
-    private $MSG_PI_APPROVAL_EMAIL = CONFIG["mail"]["pi_approve"];
-    private $MSG_PI_APPROVAL_NAME = CONFIG["mail"]["pi_approve_name"];
+    private $MSG_LINKREF;
+    private $MSG_SENDER_EMAIL;
+    private $MSG_SENDER_NAME;
+    private $MSG_SUPPORT_EMAIL;
+    private $MSG_SUPPORT_NAME;
+    private $MSG_ADMIN_EMAIL;
+    private $MSG_ADMIN_NAME;
+    private $MSG_PI_APPROVAL_EMAIL;
+    private $MSG_PI_APPROVAL_NAME;
 
     public function __construct()
     {
         parent::__construct();
         $this->isSMTP();
 
+        $this->MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"];
+        $this->MSG_SENDER_EMAIL = CONFIG["mail"]["sender"];
+        $this->MSG_SENDER_NAME = CONFIG["mail"]["sender_name"];
+        $this->MSG_SUPPORT_EMAIL = CONFIG["mail"]["support"];
+        $this->MSG_SUPPORT_NAME = CONFIG["mail"]["support_name"];
+        $this->MSG_ADMIN_EMAIL = CONFIG["mail"]["admin"];
+        $this->MSG_ADMIN_NAME = CONFIG["mail"]["admin_name"];
+        $this->MSG_PI_APPROVAL_EMAIL = CONFIG["mail"]["pi_approve"];
+        $this->MSG_PI_APPROVAL_NAME = CONFIG["mail"]["pi_approve_name"];
         if (empty(CONFIG["smtp"]["host"])) {
             throw new Exception("SMTP server hostname not set");
         }

From 160ef7db0b650cf3712f305827acef5cfc46d006 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 11:53:44 -0400
Subject: [PATCH 09/11] more similar to original

---
 resources/lib/UnityMailer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lib/UnityMailer.php b/resources/lib/UnityMailer.php
index cd141e19..9a8d4756 100644
--- a/resources/lib/UnityMailer.php
+++ b/resources/lib/UnityMailer.php
@@ -12,6 +12,7 @@ class UnityMailer extends PHPMailer
 {
     private $template_dir = __DIR__ . "/../mail"; // location of all email templates
     private $override_template_dir = __DIR__ . "/../../deployment/mail_overrides";
+
     private $MSG_LINKREF;
     private $MSG_SENDER_EMAIL;
     private $MSG_SENDER_NAME;

From 53f1698daac387bb470a5a15fbdf1eca5c5f45ba Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 12:08:05 -0400
Subject: [PATCH 10/11] remove `require_once UnityConfig.php` from
 phpunit-bootstrap.php

---
 test/phpunit-bootstrap.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/phpunit-bootstrap.php b/test/phpunit-bootstrap.php
index 4fe54777..fd167e28 100644
--- a/test/phpunit-bootstrap.php
+++ b/test/phpunit-bootstrap.php
@@ -14,7 +14,6 @@
 require_once __DIR__ . "/../resources/lib/UnityMailer.php";
 require_once __DIR__ . "/../resources/lib/UnitySSO.php";
 require_once __DIR__ . "/../resources/lib/UnitySite.php";
-require_once __DIR__ . "/../resources/lib/UnityConfig.php";
 require_once __DIR__ . "/../resources/lib/UnityWebhook.php";
 require_once __DIR__ . "/../resources/lib/UnityRedis.php";
 require_once __DIR__ . "/../resources/lib/UnityGithub.php";

From cbb2738f4202b84b9f67b090159cf088f89dd49a Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Wed, 10 Sep 2025 12:09:30 -0400
Subject: [PATCH 11/11] mute warnings when using null coalesce operator

---
 resources/lib/UnityRedis.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/lib/UnityRedis.php b/resources/lib/UnityRedis.php
index 2f2bd9c9..4dcf6693 100644
--- a/resources/lib/UnityRedis.php
+++ b/resources/lib/UnityRedis.php
@@ -13,8 +13,8 @@ class UnityRedis
 
     public function __construct()
     {
-        $host = CONFIG["redis"]["host"] ?? "";
-        $port = CONFIG["redis"]["port"] ?? "";
+        $host = @CONFIG["redis"]["host"] ?? "";
+        $port = @CONFIG["redis"]["port"] ?? "";
         if (empty($host)) {
             $this->enabled = false;
         } else {