Merge branch 'absolute-require' into testing2

simonLeary42 · simonLeary42 · commit a33a360c8098 · 2025-04-20T16:05:15.000-04:00
diff --git a/webroot/admin/ajax/get_group_members.php b/webroot/admin/ajax/get_group_members.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../../resources/autoload.php";
+require_once __DIR__ . "/../../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnityGroup;
 
diff --git a/webroot/admin/ajax/get_page_contents.php b/webroot/admin/ajax/get_page_contents.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../../resources/autoload.php";
+require_once __DIR__ . "/../../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
     die();
diff --git a/webroot/admin/content.php b/webroot/admin/content.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
     die();
diff --git a/webroot/admin/notices.php b/webroot/admin/notices.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 if (!$USER->isAdmin()) {
     die();
diff --git a/webroot/admin/pi-mgmt.php b/webroot/admin/pi-mgmt.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnityUser;
 use UnityWebPortal\lib\UnityGroup;
@@ -90,9 +90,9 @@
         "<form action='' method='POST'>
         <input type='hidden' name='form_name' value='req'>
         <input type='hidden' name='uid' value='" . $request_user->getUID() . "'>
-        <input type='submit' name='action' value='Approve' 
+        <input type='submit' name='action' value='Approve'
         onclick='return confirm(\"Are you sure you want to approve " . $request_user->getUID() . "?\");'>
-        <input type='submit' name='action' value='Deny' 
+        <input type='submit' name='action' value='Deny'
         onclick='return confirm(\"Are you sure you want to deny " . $request_user->getUID() . "?\");'>
         </form>";
         echo "</td>";
@@ -130,7 +130,7 @@
         echo "<td><a href='mailto:" . $pi_user->getMail() . "'>" . $pi_user->getMail() . "</a></td>";
         echo "<td>";
         echo
-        "<form action='' method='POST' 
+        "<form action='' method='POST'
     onsubmit='return confirm(\"Are you sure you want to remove " . $pi_group->getPIUID() . "?\")'>
         <input type='hidden' name='form_name' value='remGroup'>
         <input type='hidden' name='pi' value='" . $pi_group->getPIUID() . "'>
diff --git a/webroot/admin/user-mgmt.php b/webroot/admin/user-mgmt.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnitySite;
 
@@ -63,7 +63,7 @@
         }
         echo "</td>";
         echo "<td>";
-        echo "<form class='viewAsUserForm' action='' method='POST' 
+        echo "<form class='viewAsUserForm' action='' method='POST'
         onsubmit='return confirm(\"Are you sure you want to switch to the user " . $user->getUID() . "?\");'>
         <input type='hidden' name='form_name' value='viewAsUser'>
         <input type='hidden' name='uid' value='" . $user->getUID() . "'>
diff --git a/webroot/api/content/index.php b/webroot/api/content/index.php
@@ -2,7 +2,7 @@
 
 header('Content-type: text/plain');
 
-require_once "../../../resources/autoload.php";
+require_once __DIR__ . "/../../../resources/autoload.php";
 
 if (isset($_GET["line_wrap"])) {
     $CHAR_WRAP = $_GET["line_wrap"];
diff --git a/webroot/api/notices/index.php b/webroot/api/notices/index.php
@@ -2,7 +2,7 @@
 
 header('Content-type: text/plain');
 
-require_once "../../../resources/autoload.php";
+require_once __DIR__ . "/../../../resources/autoload.php";
 
 $notices = $SQL->getNotices();
 $jsonArray = [];
diff --git a/webroot/index.php b/webroot/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../resources/autoload.php";
+require_once __DIR__ . "/../resources/autoload.php";
 
 require_once $LOC_HEADER;
 ?>
diff --git a/webroot/panel/account.php b/webroot/panel/account.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnitySite;
 
@@ -114,16 +114,16 @@
 } elseif ($isActive) {
     echo "<p>You are curently a <strong>user</strong> on the Unity Cluster</p>";
 } else {
-    echo "<p>You are currently not assigned to any PI, and will be 
-    <strong>unable to use the cluster</strong>. Go to the <a href='groups.php'>My PIs</a> 
+    echo "<p>You are currently not assigned to any PI, and will be
+    <strong>unable to use the cluster</strong>. Go to the <a href='groups.php'>My PIs</a>
     page to join a PI, or click on the button below if you are a PI</p>";
     echo "<p>Students should not request a PI account.</p>";
 }
 
 if (!$isPI) {
     if ($SQL->accDeletionRequestExists($USER->getUID())) {
         echo
-        "<form action='' method='POST' id='piReq' 
+        "<form action='' method='POST' id='piReq'
         onsubmit='return confirm(\"Are you sure you want to request a PI account?\")'>
         <input type='hidden' name='form_type' value='pi_request'>";
         echo "<input type='submit' value='Request PI Account' disabled>";
@@ -134,7 +134,7 @@
         echo "</form>";
     } else {
         echo
-        "<form action='' method='POST' id='piReq' 
+        "<form action='' method='POST' id='piReq'
         onsubmit='return confirm(\"Are you sure you want to request a PI account?\")'>
         <input type='hidden' name='form_type' value='pi_request'>";
         if ($SQL->requestExists($USER->getUID())) {
@@ -162,7 +162,7 @@
     echo
     "<div class='key-box'>
     <textarea spellcheck='false' readonly>" . $sshPubKeys[$i] . "</textarea>
-    <form action='' id='del-" . $i . "' 
+    <form action='' id='del-" . $i . "'
     onsubmit='return confirm(\"Are you sure you want to delete this SSH key?\");' method='POST'>
     <input type='hidden' name='delIndex' value='$i'>
     <input type='hidden' name='form_type' value='delKey'>
@@ -181,7 +181,7 @@
 
     <input type="hidden" name="form_type" value="loginshell">
 
-    <select id="loginSelector" name= "shellSelect"> 
+    <select id="loginSelector" name= "shellSelect">
 
         <option value="" disabled hidden>Select Login Shell...</option>
 
@@ -208,10 +208,10 @@
     <?php
 
     if ($found_selector) {
-        echo "<input id='customLoginBox' type='text' 
+        echo "<input id='customLoginBox' type='text'
         placeholder='Enter login shell path (ie. /bin/bash)' name='shell'>";
     } else {
-        echo "<input id='customLoginBox' type='text' 
+        echo "<input id='customLoginBox' type='text'
         placeholder='Enter login shell path (ie. /bin/bash)' name='shell' value='$cur_shell'>";
     }
 
@@ -231,7 +231,7 @@
     echo "<p>You cannot request to delete your account while you are in a PI group.</p>";
 } else {
     echo
-    "<form action='' method='POST' id='accDel' 
+    "<form action='' method='POST' id='accDel'
     onsubmit='return confirm(\"Are you sure you want to request an account deletion?\")'>
     <input type='hidden' name='form_type' value='account_deletion_request'>";
     if ($SQL->accDeletionRequestExists($USER->getUID())) {
diff --git a/webroot/panel/ajax/get_group_members.php b/webroot/panel/ajax/get_group_members.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../../resources/autoload.php";
+require_once __DIR__ . "/../../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnityGroup;
 
diff --git a/webroot/panel/groups.php b/webroot/panel/groups.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnityGroup;
 
@@ -85,12 +85,12 @@
 echo "<h5>Current Groups</h5>";
 
 if ($USER->isPI() && count($groups) == 1) {
-    echo "You are only a member of your own PI group. 
+    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> page to see your group.";
 }
 
 if (count($groups) == 0) {
-    echo "You are not a member of any groups. Request to join a PI using the button below, 
+    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"] .
     "/panel/account.php'>account settings</a> page";
 }
@@ -112,7 +112,7 @@
     echo "<td><a href='mailto:" . $owner->getMail() . "'>" . $owner->getMail() . "</a></td>";
     echo
     "<td>
-    <form action='' method='POST' 
+    <form action='' method='POST'
     onsubmit='return confirm(\"Are you sure you want to leave the PI group " . $group->getPIUID() . "?\")'>
     <input type='hidden' name='form_name' value='removePIForm'>
     <input type='hidden' name='pi' value='" . $group->getPIUID() . "'>
diff --git a/webroot/panel/modal/new_key.php b/webroot/panel/modal/new_key.php
@@ -1,9 +1,9 @@
 <?php
 
-require_once "../../../resources/autoload.php";  // Load required libs
+require_once __DIR__ . "/../../../resources/autoload.php";  // Load required libs
 ?>
 
-<form id="newKeyform" enctype="multipart/form-data" method="POST" 
+<form id="newKeyform" enctype="multipart/form-data" method="POST"
 action="<?php echo $CONFIG["site"]["prefix"]; ?>/panel/account.php">
     <input type='hidden' name='form_type' value='addKey'>
 
@@ -16,12 +16,12 @@
         <input type="radio" id="import" name="add_type" value="import">
         <label for="import">Local File</label>
     </div>
-    
+
     <div class='inline'>
         <input type="radio" id="generate" name="add_type" value="generate">
         <label for="generate">Generate Key</label>
     </div>
-    
+
     <div class='inline'>
         <input type="radio" id="github" name="add_type" value="github">
         <label for="github">Import from GitHub</label>
diff --git a/webroot/panel/modal/new_pi.php b/webroot/panel/modal/new_pi.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../../resources/autoload.php";  // Load required libs
+require_once __DIR__ . "/../../../resources/autoload.php";  // Load required libs
 ?>
 
 <form id="newPIform" method="POST" action="<?php echo $CONFIG["site"]["prefix"]; ?>/panel/groups.php">
@@ -40,4 +40,4 @@
     $(document).click(function() {
         $("div.searchWrapper").hide();
     });
-</script>
+</script>
diff --git a/webroot/panel/modal/pi_search.php b/webroot/panel/modal/pi_search.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../../resources/autoload.php";  // Load required libs
+require_once __DIR__ . "/../../../resources/autoload.php";  // Load required libs
 
 $search_query = $_GET["search"];  // Search is passed as a get var
 if (empty($search_query)) {
diff --git a/webroot/panel/new_account.php b/webroot/panel/new_account.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnitySite;
 use UnityWebPortal\lib\UnityGroup;
@@ -50,7 +50,7 @@
     </div>
     <p>Your unity cluster username will be <strong><?php echo $SSO["user"]; ?></strong></p>
 
-    <p>In order to activate your account on the Unity cluster, 
+    <p>In order to activate your account on the Unity cluster,
         you must join an existing PI group, or request your own PI group.</p>
 
     <hr>
@@ -59,7 +59,7 @@
     $pending_requests = $SQL->getRequestsByUser($USER->getUID());
     if (count($pending_requests) > 0) {
         // already has pending requests
-        echo "<p>Your request to activate your account has been submitted. 
+        echo "<p>Your request to activate your account has been submitted.
 		You will receive an email when your account is activated.</p>";
     } else {
         echo "<label><input type='radio' name='new_user_sel' value='pi'>Request a PI account (I am a PI)</label>";
diff --git a/webroot/panel/pi.php b/webroot/panel/pi.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../../resources/autoload.php";
+require_once __DIR__ . "/../../resources/autoload.php";
 
 use UnityWebPortal\lib\UnityUser;
 use UnityWebPortal\lib\UnitySite;
@@ -49,7 +49,7 @@
 $assocs = $group->getGroupMembers();
 
 if (count($requests) + count($assocs) == 1) {
-    echo "<p>You do not have any users attached to your PI account. 
+    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"] .
     "/panel/groups.php'>My PIs</a> page.</p>";
 }
@@ -69,9 +69,9 @@
         "<form action='' method='POST'>
         <input type='hidden' name='form_name' value='userReq'>
         <input type='hidden' name='uid' value='" . $request[0]->getUID() . "'>
-        <input type='submit' name='action' value='Approve' 
+        <input type='submit' name='action' value='Approve'
         onclick='return confirm(\"Are you sure you want to approve " . $request[0]->getUID() . "?\")'>
-        <input type='submit' name='action' value='Deny' 
+        <input type='submit' name='action' value='Deny'
         onclick='return confirm(\"Are you sure you want to deny " . $request[0]->getUID() . "?\")'>
         </form>";
         echo "</td>";
@@ -99,7 +99,7 @@
     "<form action='' method='POST'>
     <input type='hidden' name='form_name' value='remUser'>
     <input type='hidden' name='uid' value='" . $assoc->getUID() . "'>
-    <input type='submit' value='Remove' 
+    <input type='submit' value='Remove'
     onclick='return confirm(\"Are you sure you want to remove " . $assoc->getUID() . " from your PI group?\")'>
     </form>";
     echo "</td>";
diff --git a/workers/clear-audit-log.php b/workers/clear-audit-log.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once "../resources/autoload.php";
-require_once "../resources/init.php";
+require_once __DIR__ . "/../resources/autoload.php";
+require_once __DIR__ . "/../resources/init.php";
 
 # Days to keep
 $days = 30;
diff --git a/workers/group_user_request_owner_reminder.php b/workers/group_user_request_owner_reminder.php
@@ -5,7 +5,7 @@
 Removes the request after 34 days have passed.
 */
 
-require_once "../resources/autoload.php";
+require_once __DIR__ . "/../resources/autoload.php";
 use UnityWebPortal\lib\UnityGroup;
 
 $today = time();
diff --git a/workers/update-ldap-cache.php b/workers/update-ldap-cache.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../resources/autoload.php";
+require_once __DIR__ . "/../resources/autoload.php";
 
 // Get Users
 $users = $LDAP->getAllUsers($SQL, $MAILER, $REDIS, $WEBHOOK, true);
