From 33aee7ad7135d398a92403cd130c9752e3085e9a Mon Sep 17 00:00:00 2001
From: Greg Sarjeant <1686767+gsarjeant@users.noreply.github.com>
Date: Sat, 21 Jun 2025 17:44:55 -0400
Subject: [PATCH] Add tabindex to anchors to account for bad browser defaults.
 More cleanup.

---
 templates/partials/home.php   |  4 ++--
 templates/partials/navbar.php | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/partials/home.php b/templates/partials/home.php
index 3575905..828f16e 100644
--- a/templates/partials/home.php
+++ b/templates/partials/home.php
@@ -12,7 +12,7 @@
                             <span class="profile-greeting-content-mood"><?php echo Util::escape_html($user->mood) ?></span>
                         </span>
 <?php if (Session::isLoggedIn()): ?>
-                        <a tabindex="0" href="<?= $config->basePath ?>mood" class="change-mood">Change mood</a>
+                        <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>mood" class="change-mood">Change mood</a>
 <?php endif ?>
                     </dd>
 <?php if (!empty($user->about)): ?>
@@ -43,7 +43,7 @@
 <?php endif; ?>
             </aside>
             <main id="ticks">
-                <h1 class="site-description"><?= $config->siteDescription ?></h1>
+                <h1 class="site-description"><?= Util::escape_html($config->siteDescription) ?></h1>
                 <?php echo $tickList ?>
             </main>
         </div>
diff --git a/templates/partials/navbar.php b/templates/partials/navbar.php
index 6230837..4ee40b2 100644
--- a/templates/partials/navbar.php
+++ b/templates/partials/navbar.php
@@ -1,25 +1,25 @@
 <?php /** @var ConfigModel $config */ ?>
 <?php /* https://www.w3schools.com/howto/howto_css_dropdown.asp */ ?>
         <nav aria-label="Main navigation">
-            <a tabindex="0" href="<?= $config->basePath ?>">home</a>
+            <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>">home</a>
             <details>
                 <summary aria-haspopup="true">feeds</summary>
                 <div class="dropdown-items">
-                    <a tabindex="0" href="<?= $config->basePath ?>feed/rss">rss</a>
-                    <a tabindex="0" href="<?= $config->basePath ?>feed/atom">atom</a>
+                    <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>feed/rss">rss</a>
+                    <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>feed/atom">atom</a>
                 </div>
             </details>
 <?php if (!Session::isLoggedIn()): ?>
-            <a tabindex="0" href="<?= $config->basePath ?>login">login</a>
+            <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>login">login</a>
 <?php else: ?>
             <details>
                 <summary aria-haspopup="true">admin</summary>
                 <div class="dropdown-items">
-                    <a tabindex="0" href="<?= $config->basePath ?>admin">settings</a>
-                    <a tabindex="0" href="<?= $config->basePath ?>admin/css">css</a>
-                    <a tabindex="0" href="<?= $config->basePath ?>admin/emoji">emoji</a>
+                    <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>admin">settings</a>
+                    <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>admin/css">css</a>
+                    <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>admin/emoji">emoji</a>
                 </div>
             </details>
-            <a tabindex="0" href="<?= $config->basePath ?>logout">logout</a>
+            <a tabindex="0" href="<?= Util::escape_html($config->basePath) ?>logout">logout</a>
 <?php endif; ?>
         </nav>
\ No newline at end of file