getHyperlink

Author: simonLeary42

resources/lib/utils.php

@@ -83,7 +83,15 @@ function pathJoin()
     return preg_replace("#/+#", "/", join("/", $paths));
 }
 
-function getURL(...$args)
+function getURL(...$path_components)
 {
-    return pathJoin([CONFIG["site"]["url"], CONFIG["site"]["prefix"], ...$args]);
+    return pathJoin([CONFIG["site"]["url"], CONFIG["site"]["prefix"], ...$path_components]);
+}
+
+function getHyperlink($text, ...$path_components)
+{
+    $text = htmlspecialchars($text);
+    $path_components = array_map("htmlspecialchars", $path_components);
+    $url = getURL(...$path_components);
+    return "<a href='$url'>$text</a>";
 }

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 getURL("/"); ?>'>Unity Cluster</a>.
+    on the <?php echo getHyperlink("Unity Cluster", "/"); ?>.
     If you would like to stop receiving these emails,
     you may request to close your account by replying to this email.
   </span>

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 getURL("panel/pi.php"); ?>">on this page</a>.
+<?php echo getHyperlink("on this page", "panel/pi.php"); ?>.
 </p>
 
 <p>Do not hesitate to reply if you have any questions!</p>

resources/mail/group_request_admin.php

@@ -19,6 +19,6 @@
 
 <p>
 You can approve this account
-<a href="<?php echo getURL("admin/pi-mgmt.php"); ?>">here</a>
+<?php echo getHyperlink("here", "admin/pi-mgmt.php"); ?>
 .
 </p>

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 getURL("panel/groups.php"); ?>">my groups</a>
+Navigate to the <?php echo getHyperlink("my groups", "panel/groups.php"); ?>
 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>

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 getURL("panel/pi.php"); ?>">my users</a> page</p>
+    <?php echo getHyperlink("my users", "panel/pi.php"); ?> page</p>

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 getURL("panel/account.php"); ?>">account settings</a> page</p>
+<?php echo getHyperlink("account settings", "panel/account.php"); ?> page</p>
 
 <p>If you believe this to be a mistake, please reply to this email as soon as possible.</p>

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 getURL("/panel/account.php"); ?>">account settings</a> page.</p>
+    <?php echo getHyperlink("account settings", "/panel/account.php"); ?> page.</p>
 
 <p>If you believe this to be a mistake, please reply to this email as soon as possible.</p>

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 getURL("/panel/account.php"); ?>">account settings</a>
+<?php echo getHyperlink("account settings", "/panel/account.php"); ?>
 page.
 </p>
 

resources/templates/header.php

@@ -77,9 +77,8 @@
 
   <nav class="mainNav">
     <?php
-    $prefix = CONFIG["site"]["prefix"];
     // Public Items - Always Visible
-    echo "<a href='$prefix/index.php'>Home</a>";
+    echo getHyperlink("Home", "index.php");
 
     $num_additional_items = count(CONFIG["menuitems"]["labels"]);
     for ($i = 0; $i < $num_additional_items; $i++) {
@@ -89,13 +88,13 @@
 
     if (isset($_SESSION["user_exists"]) && $_SESSION["user_exists"]) {
         // Menu Items for Present Users
-        echo "<a href='$prefix/panel/support.php'>Support</a>";
-        echo "<a href='$prefix/panel/account.php'>Account Settings</a>";
-        echo "<a href='$prefix/panel/groups.php'>My PIs</a>";
+        echo getHyperlink("Support", "panel/support.php");
+        echo getHyperlink("Account Settings", "panel/account.php");
+        echo getHyperlink("My PIs", "panel/groups.php");
 
         if (isset($_SESSION["is_pi"]) && $_SESSION["is_pi"]) {
             // PI only pages
-            echo "<a href='$prefix/panel/pi.php'>My Users</a>";
+            echo getHyperlink("My Users", "panel/pi.php");
         }
 
         // additional branding items
@@ -111,13 +110,13 @@
         ) {
             echo "<hr class='navHR'>";
             // Admin only pages
-            echo "<a href='$prefix/admin/user-mgmt.php'>User Management</a>";
-            echo "<a href='$prefix/admin/pi-mgmt.php'>PI Management</a>";
-            echo "<a href='$prefix/admin/notices.php'>Cluster Notices</a>";
-            echo "<a href='$prefix/admin/content.php'>Content Management</a>";
+            echo getHyperlink("User Management", "admin/user-mgmt.php");
+            echo getHyperlink("PI Management", "admin/pi-mgmt.php");
+            echo getHyperlink("Cluster Notices", "admin/notices.php");
+            echo getHyperlink("Content Management", "admin/content.php");
         }
     } else {
-        echo "<a href='$prefix/panel/account.php'>Login / Request Account</a>";
+        echo getHyperlink("Login / Request Account", "panel/account.php");
     }
     ?>
   </nav>