cleanup

Author: simonLeary42

webroot/admin/content.php

@@ -51,10 +51,10 @@
         .catch(error => {
             console.error(error)
         });
-    const prefix = '<?php echo CONFIG["site"]["prefix"]; ?>';
+    const url = '<?php echo getURL("admin/ajax/get_page_contents.php"); ?>';
     $("#pageForm > select[name=pageSel]").change(function(e) {
         $.ajax({
-            url: `${prefix}/admin/ajax/get_page_contents.php?pageid=` + $(this).val(),
+            url: `${url}?pageid=` + $(this).val(),
             success: function(result) {
             mainEditor.setData(result);
         }});

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 = substr(getURL(""), strlen(CONFIG["site"]["url"]), -1);
+    $form_url = getURL("panel/groups.php");
     echo "
         <p>
             You are currently an <strong>unqualified user</strong>, and will be
@@ -137,7 +137,7 @@
             Do not request a PI group if you are a student.
         </p>
         <br>
-        <form action='$sitePrefix/panel/groups.php' method='GET'>
+        <form action='$form_url' method='GET'>
             <label>
                 <input type='checkbox' name='tos' value='agree' required />
                 I have read and accept the
@@ -269,11 +269,11 @@
 ?>
 
 <script>
-    const sitePrefix = '<?php echo CONFIG["site"]["prefix"]; ?>';
+    const url = '<?php echo getURL("panel/modal/new_key.php")?>';
     const ldapLoginShell = '<?php echo $USER->getLoginShell(); ?>';
 
     $("button.btnAddKey").click(function() {
-        openModal("Add New Key", `${sitePrefix}/panel/modal/new_key.php`);
+        openModal("Add New Key", url);
     });
 
     $("#loginSelector option").each(function(i, e) {

webroot/panel/modal/new_pi.php

@@ -26,9 +26,9 @@
 <script>
     $("input[type=text][name=pi]").keyup(function() {
         var searchWrapper = $("div.searchWrapper");
-        const prefix = '<?php echo CONFIG["site"]["prefix"]; ?>';
+        const url = '<?php echo getURL("panel/modal/pi_search.php") ?>';
         $.ajax({
-            url: `${prefix}/panel/modal/pi_search.php?search=` + $(this).val(),
+            url: `${url}?search=` + $(this).val(),
             success: function(result) {
                 searchWrapper.html(result);