wip

simonLeary42 · simonLeary42 · commit ede219ebfd54 · 2025-12-11T16:32:31.000-05:00
diff --git a/resources/lib/UnityHTTPD.php b/resources/lib/UnityHTTPD.php
@@ -41,7 +41,7 @@ public static function die(mixed $x = null, bool $show_user = false): never
     */
     public static function redirect(?string $dest = null): never
     {
-        $dest ??= pathJoin(CONFIG["site"]["prefix"], $_SERVER["REQUEST_URI"]);
+        $dest ??= getURL($_SERVER["REQUEST_URI"]);
         $dest = htmlspecialchars($dest);
         header("Location: $dest");
         http_response_code(302);
diff --git a/resources/lib/UnityMailer.php b/resources/lib/UnityMailer.php
@@ -13,7 +13,6 @@ class UnityMailer extends PHPMailer
     private string $template_dir = __DIR__ . "/../mail"; // location of all email templates
     private string $override_template_dir = __DIR__ . "/../../deployment/mail_overrides";
 
-    private string $MSG_LINKREF;
     private string $MSG_SENDER_EMAIL;
     private string $MSG_SENDER_NAME;
     private string $MSG_SUPPORT_EMAIL;
@@ -28,7 +27,6 @@ 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"];
diff --git a/resources/lib/UnityWebhook.php b/resources/lib/UnityWebhook.php
@@ -7,13 +7,8 @@ class UnityWebhook
     private string $template_dir = __DIR__ . "/../mail";
     private string $override_template_dir = __DIR__ . "/../../deployment/mail_overrides";
     private string $url = CONFIG["webhook"]["url"];
-    private string $MSG_LINKREF;
     private string $Subject; // set by template
 
-    public function __construct()
-    {
-        $this->MSG_LINKREF = CONFIG["site"]["url"] . CONFIG["site"]["prefix"];
-    }
     public function htmlToMarkdown(string $html): string
     {
         // Define regex patterns for each markdown format
diff --git a/resources/lib/utils.php b/resources/lib/utils.php
@@ -82,3 +82,8 @@ function pathJoin()
     }
     return preg_replace("#/+#", "/", join("/", $paths));
 }
+
+function getURL(...$args)
+{
+    return pathJoin([CONFIG["site"]["url"], CONFIG["site"]["prefix"], ...$args]);
+}
diff --git a/resources/mail/footer.php b/resources/mail/footer.php
@@ -3,7 +3,7 @@
 >
   <span>
     You are receiving this email because you have an account
-    on the <a target='_blank' href='<?php echo $this->MSG_LINKREF; ?>'>Unity Cluster</a>.
+    on the <a target='_blank' href='<?php echo getURL("/"); ?>'>Unity Cluster</a>.
     If you would like to stop receiving these emails,
     you may request to close your account by replying to this email.
   </span>
diff --git a/resources/mail/group_created.php b/resources/mail/group_created.php
@@ -8,7 +8,7 @@
 <p>
 Your request for a PI account on the Unity cluster has been approved.
 You can access the management page for your group
-<a href="<?php echo $this->MSG_LINKREF; ?>/panel/pi.php">on this page</a>.
+<a href="<?php echo getURL("panel/pi.php"); ?>">on this page</a>.
 </p>
 
 <p>Do not hesitate to reply if you have any questions!</p>
diff --git a/resources/mail/group_request_admin.php b/resources/mail/group_request_admin.php
@@ -19,6 +19,6 @@
 
 <p>
 You can approve this account
-<a href="<?php echo $this->MSG_LINKREF; ?>/admin/pi-mgmt.php">here</a>
+<a href="<?php echo getURL("admin/pi-mgmt.php"); ?>">here</a>
 .
 </p>
diff --git a/resources/mail/group_user_added.php b/resources/mail/group_user_added.php
@@ -6,7 +6,7 @@
 <p>Hello,</p>
 
 <p>You have been approved to join the PI group <?php echo $data["group"]; ?>.
-Navigate to the <a href="<?php echo $this->MSG_LINKREF; ?>/panel/groups.php">my groups</a>
+Navigate to the <a href="<?php echo getURL("panel/groups.php"); ?>">my groups</a>
 page to see your PI groups.</p>
 
 <p>If you believe this to be a mistake, please reply to this email as soon as possible.</p>
diff --git a/resources/mail/group_user_request_owner.php b/resources/mail/group_user_request_owner.php
@@ -22,4 +22,4 @@
 </p>
 
 <p>You can approve or deny this user on the
-    <a href="<?php echo $this->MSG_LINKREF; ?>/panel/pi.php">my users</a> page</p>
+    <a href="<?php echo getURL("panel/pi.php"); ?>">my users</a> page</p>
diff --git a/resources/mail/user_loginshell.php b/resources/mail/user_loginshell.php
@@ -7,6 +7,6 @@
 
 <p>You have updated your login shell on the Unity cluster to <?php echo $data["new_shell"]; ?>.
 You can view the login shell settings on the
-<a href="<?php echo $this->MSG_LINKREF; ?>/panel/account.php">account settings</a> page</p>
+<a href="<?php echo getURL("panel/account.php"); ?>">account settings</a> page</p>
 
 <p>If you believe this to be a mistake, please reply to this email as soon as possible.</p>
diff --git a/resources/mail/user_qualified.php b/resources/mail/user_qualified.php
@@ -15,6 +15,6 @@
 
 <p>Please login to the web portal to access Unity.
     If you need console access, you will need to set your SSH keys in the
-    <a href="<?php echo $this->MSG_LINKREF; ?>/panel/account.php">account settings</a> page.</p>
+    <a href="<?php echo getURL("/panel/account.php"); ?>">account settings</a> page.</p>
 
 <p>If you believe this to be a mistake, please reply to this email as soon as possible.</p>
diff --git a/resources/mail/user_sshkey.php b/resources/mail/user_sshkey.php
@@ -15,7 +15,7 @@
 
 <p>
 You can view the SSH public keys attached to your account on the
-<a href="<?php echo $this->MSG_LINKREF; ?>/panel/account.php">account settings</a>
+<a href="<?php echo getURL("/panel/account.php"); ?>">account settings</a>
 page.
 </p>
 
diff --git a/resources/templates/footer.php b/resources/templates/footer.php
@@ -10,7 +10,7 @@
     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='" . getURL("assets", $footer_logos[$i]) . "'
         draggable='false' title='" . $footer_titles[$i] . "'></a>";
     }
     ?>
@@ -30,9 +30,9 @@
 
 </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 getURL("js/filter.js") ;?>"></script>
+<script src="<?php echo getURL("js/sort.js"); ?>"></script>
+<script src="<?php echo getURL("js/global.js"); ?>"></script>
+<script src="<?php echo getURL("js/tables.js"); ?>"></script>
 
 </html>
diff --git a/resources/templates/header.php b/resources/templates/header.php
@@ -8,7 +8,7 @@
         && ($_POST["form_type"] ?? null) == "clearView"
     ) {
         unset($_SESSION["viewUser"]);
-        UnityHTTPD::redirect(CONFIG["site"]["prefix"] . "/admin/user-mgmt.php");
+        UnityHTTPD::redirect(getURL("/admin/user-mgmt.php"));
     }
     // Webroot files need to handle their own POSTs before loading the header
     // so that they can do UnityHTTPD::badRequest before anything else has been printed.
@@ -24,7 +24,7 @@
         !$_SESSION["user_exists"]
         && !str_ends_with($_SERVER['PHP_SELF'], "/panel/new_account.php")
     ) {
-        UnityHTTPD::redirect(CONFIG["site"]["prefix"] . "/panel/new_account.php");
+        UnityHTTPD::redirect(getURL("/panel/new_account.php"));
     }
 }
 
@@ -49,15 +49,10 @@
   </style>
 
   <?php
-    $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'>
-        <link rel='stylesheet' type='text/css' href='$prefix/css/modal.css'>
-        <link rel='stylesheet' type='text/css' href='$prefix/css/tables.css'>
-        <link rel='stylesheet' type='text/css' href='$prefix/css/filters.css'>
-        <link rel='stylesheet' type='text/css' href='$prefix/css/messages.css'>
-    ";
+    foreach (["global", "navbar", "tables", "filters", "messages"] as $x) {
+        $url = getURL("css/$x.css");
+        echo "<link rel='stylesheet' type='text/css' href='$url'>";
+    }
     ?>
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -70,11 +65,11 @@
 
   <header>
     <img id="imgLogo" draggable=false
-    src="<?php echo CONFIG["site"]["prefix"]; ?>/assets/<?php echo CONFIG["site"]["logo"]; ?>">
+    src="<?php echo getURL("assets", CONFIG["site"]["logo"]); ?>">
     <button class="hamburger vertical-align">
       <img
         draggable="false"
-        src="<?php echo CONFIG["site"]["prefix"]; ?>/assets/menu.png"
+        src="<?php echo getURL("assets/menu.png") ?>"
         alt="Menu Button"
       >
     </button>
@@ -136,7 +131,7 @@
       <div class="modalBody"></div>
     </div>
   </div>
-  <script src="<?php echo CONFIG["site"]["prefix"]; ?>/js/modal.js"></script>
+  <script src="<?php echo getURL("/js/modal.js"); ?>"></script>
 
   <main>
 
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
@@ -143,7 +143,7 @@ class="filterSearch"
         }
     });
 
-    var ajax_url = "<?php echo CONFIG["site"]["prefix"]; ?>/admin/ajax/get_group_members.php?gid=";
+    var ajax_url = "<?php echo getURL("/admin/ajax/get_group_members.php"); ?>?gid=";
 </script>
 
 <?php
diff --git 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"];
-            UnityHTTPD::redirect(CONFIG["site"]["prefix"] . "/panel/account.php");
+            UnityHTTPD::redirect(getURL("/panel/account.php"));
             break;
     }
 }
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
@@ -128,7 +128,7 @@
     echo "<p>You are curently a <strong>qualified user</strong> on the Unity Cluster</p>";
 } else {
     $tos_url = CONFIG["site"]["terms_of_service_url"];
-    $sitePrefix = CONFIG["site"]["prefix"];
+    $sitePrefix = substr(getURL(""), strlen(CONFIG["site"]["url"]), -1);
     echo "
         <p>
             You are currently an <strong>unqualified user</strong>, and will be
diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php
@@ -123,14 +123,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='" . getURL("/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='" . getURL("/panel/groups.php") .
         "/panel/account.php'>account settings</a> page";
 }
 
@@ -180,11 +180,11 @@
 
 <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 getURL("/panel/modal/new_pi.php"); ?>");
     });
 
     // 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 getURL("/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
@@ -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 getURL("/panel/account.php"); ?>">
     <input type='hidden' name='form_type' value='addKey'>
 
     <div class='inline'>
@@ -68,7 +68,7 @@ function generateKey(type) {
         var endingSection = "</section>";
 
         $.ajax({
-            url: "<?php echo CONFIG["site"]["prefix"]; ?>/js/ajax/ssh_generate.php?type=" + type,
+            url: "<?php echo getURL("/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);
@@ -97,7 +97,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 getURL("/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
@@ -6,7 +6,7 @@
 <form
     id="newPIform"
     method="POST"
-    action="<?php echo CONFIG["site"]["prefix"]; ?>/panel/groups.php"
+    action="<?php echo getURL("/panel/groups.php"); ?>"
 >
     <input type="hidden" name="form_type" value="addPIform">
     <div style="position: relative;">
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
@@ -6,7 +6,7 @@
 use UnityWebPortal\lib\UnityUser;
 
 if ($USER->exists()) {
-    UnityHTTPD::redirect(CONFIG["site"]["prefix"] . "/panel/account.php");
+    UnityHTTPD::redirect(getURL("/panel/account.php"));
 }
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
     $user = new UnityUser($SSO["user"], $LDAP, $SQL, $MAILER, $WEBHOOK);
diff --git 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='" . getURL("/panel/groups.php") .
         "/panel/groups.php'>My PIs</a> page.</p>";
 }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static function die(mixed $x = null, bool $show_user = false): never`
`41`	`41`	`*/`
`42`	`42`	`public static function redirect(?string $dest = null): never`
`43`	`43`	`{`
`44`		`- $dest ??= pathJoin(CONFIG["site"]["prefix"], $_SERVER["REQUEST_URI"]);`
	`44`	`+ $dest ??= getURL($_SERVER["REQUEST_URI"]);`
`45`	`45`	`$dest = htmlspecialchars($dest);`
`46`	`46`	`header("Location: $dest");`
`47`	`47`	`http_response_code(302);`
Original file line number	Diff line number	Diff line change
`@@ -82,3 +82,8 @@ function pathJoin()`
`82`	`82`	`}`
`83`	`83`	`return preg_replace("#/+#", "/", join("/", $paths));`
`84`	`84`	`}`
	`85`	`+`
	`86`	`+function getURL(...$args)`
	`87`	`+{`
	`88`	`+ return pathJoin([CONFIG["site"]["url"], CONFIG["site"]["prefix"], ...$args]);`
	`89`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`>`
`4`	`4`	`<span>`
`5`	`5`	`You are receiving this email because you have an account`
`6`		`- on the <a target='_blank' href='<?php echo $this->MSG_LINKREF; ?>'>Unity Cluster</a>.`
	`6`	`+ on the <a target='_blank' href='<?php echo getURL("/"); ?>'>Unity Cluster</a>.`
`7`	`7`	`If you would like to stop receiving these emails,`
`8`	`8`	`you may request to close your account by replying to this email.`
`9`	`9`	`</span>`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`
`20`	`20`	`<p>`
`21`	`21`	`You can approve this account`
`22`		`-<a href="<?php echo $this->MSG_LINKREF; ?>/admin/pi-mgmt.php">here</a>`
	`22`	`+<a href="<?php echo getURL("admin/pi-mgmt.php"); ?>">here</a>`
`23`	`23`	`.`
`24`	`24`	`</p>`