From 3471e043d3dd12dd81177800df2887693b4d3847 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 30 Apr 2026 15:54:18 +0200
Subject: [PATCH] fix: handle redirects for paths and files with terminating
 slashes

Remove the `/` from a path if it refers to a file, and add a `/` if the
path refers to a folder (implicit index.md/index.php).

Clean up keyboard search which had some assumptions about not including
the `/` but that doesn't make sense with this pattern.

Test-bot: skip
---
 .htaccess                          | 59 +++++++++++++++++++++++++++---
 _content/keyboards/index.php       |  8 ++--
 cdn/dev/keyboard-search/search.mjs |  6 +--
 resources/keyman-site.conf         |  7 +++-
 4 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/.htaccess b/.htaccess
index 6ad7d5e9..53ea9a05 100644
--- a/.htaccess
+++ b/.htaccess
@@ -49,17 +49,64 @@ RewriteRule "^((.+)/)?index(\.md|\.php)?$" "$1" [R,L]
 RewriteRule "^(.+)\.php$" "$1" [R,L]
 RewriteRule "^(.+)\.md$" "$1" [R,L]
 
-# Redirect folder without / to include /
+# ------------------------------------------------------------------
+# Add and remove `/` for folders and files for consistency
+# ------------------------------------------------------------------
+
+#
+# Note: we don't test the content of the lang path parameter (?:[^/]+)/
+# here; that is managed exclusively in the i18n section later.
+#
+
+# Redirect folder to folder/ for .php
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2" -d
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2/index.php" -f
+RewriteRule "^([^/]+)/(.+[^/])$" "$1/$2/" [R,L]
+
+# Redirect folder to folder/ for .md
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2" -d
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2/index.md" -f
+RewriteRule "^([^/]+)/(.+[^/])$" "$1/$2/" [R,L]
+
+# Redirect file/ to file (.md)
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2" !-d
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2.md" -f
+RewriteRule "^([^/]+)/(.+)/$" "$1/$2" [R,L]
+
+# Redirect file/ to file (.php)
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2" !-d
+RewriteCond "%{DOCUMENT_ROOT}/_content/$2.php" -f
+RewriteRule "^([^/]+)/(.+)/$" "$1/$2" [R,L]
+
+#
+# top-level folders and files
+#
+
+# Redirect folder to folder/ for .php
 RewriteCond "%{DOCUMENT_ROOT}/$1" -d
-RewriteCond "%{DOCUMENT_ROOT}/$1.php" !-f
-RewriteCond "%{DOCUMENT_ROOT}/$1.md" !-f
-RewriteRule "^(.+[^/])$" "$1/" [R,END]
+RewriteCond "%{DOCUMENT_ROOT}/$1/index.php" -f
+RewriteRule "^(.+[^/])$" "$1/" [R,L]
+
+# Redirect folder to folder/ for .md
+RewriteCond "%{DOCUMENT_ROOT}/$1" -d
+RewriteCond "%{DOCUMENT_ROOT}/$1/index.md" -f
+RewriteRule "^(.+[^/])$" "$1/" [R,L]
+
+# Redirect file/ to file (.md)
+RewriteCond "%{DOCUMENT_ROOT}/$1" !-d
+RewriteCond "%{DOCUMENT_ROOT}/$1.md" -f
+RewriteRule "^(.+)/$" "$1" [R,L]
+
+# Redirect file/ to file (.php)
+RewriteCond "%{DOCUMENT_ROOT}/$1" !-d
+RewriteCond "%{DOCUMENT_ROOT}/$1.php" -f
+RewriteRule "^(.+)/$" "$1" [R,L]
 
 # ------------------------------------------------------------------
 # Known path redirections
 # ------------------------------------------------------------------
 
-# Redirect /archive/downloads.php"
+# Redirect /archive/downloads.php
 RewriteRule "^archive/downloads(.php)?$" "/downloads/archive/" [NC,R=301,END,QSA]
 
 # ios and iphone and ipad to iphone-and-ipad
@@ -315,6 +362,6 @@ RewriteRule "^(([a-z]{2,3})(-([A-Za-z]{4}))?(-([a-z]{2}|[0-9]{3}))?)/(.+)/$" "/_
 RewriteRule "^(([a-z]{2,3})(-([A-Za-z]{4}))?(-([a-z]{2}|[0-9]{3}))?)/$" "/_content/index.php?lang=$1" [NC,END]
 
 # Finally, append the terminating slash for folders, given it is no longer
-# done automatically because we put DirectorySlash off
+# done automatically because we put DirectorySlash off, for the top-level paths only
 RewriteCond "%{DOCUMENT_ROOT}/_content/$7$8" -d
 RewriteRule "^(([a-z]{2,3})(-([A-Za-z]{4}))?(-([a-z]{2}|[0-9]{3}))?)(.*)([^/])?$" "$1$7$8/" [NC,R,QSA]
diff --git a/_content/keyboards/index.php b/_content/keyboards/index.php
index 1d5d1211..f6a73254 100644
--- a/_content/keyboards/index.php
+++ b/_content/keyboards/index.php
@@ -40,6 +40,8 @@ function _m($id, ...$args) {    return Locale::m(LOCALE_KEYBOARDS, $id, ...$args
   if($embed == 'none')
     Menu::render([]); // we'll be doing client-side os detection now
   Body::render();
+
+  $keyboardsPage = '/' . $head_options['language'] . '/keyboards';
 ?>
 
 <script>
@@ -59,14 +61,14 @@ function _m($id, ...$args) {    return Locale::m(LOCALE_KEYBOARDS, $id, ...$args
 
 <div class='<?= $embed == 'none' ? '' : 'embed embed-'.$embed ?>'>
 
-  <h2 class="red underline"><a href='/<?= $head_options['language']?>/keyboards'><?= _m('page_title') ?></a></h2>
+  <h2 class="red underline"><a href='<?=$keyboardsPage?>'><?= _m('page_title') ?></a></h2>
 
   <div id='search-box'>
-    <form method='get' action='/<?= $head_options['language']?>/keyboards' name='f'>
+    <form method='get' action='<?=$keyboardsPage?>' name='f'>
       <label for="search-q"><?= _m('keyboard_search') ?></label><input id="search-q" type="text" placeholder="<?= _m('enter_language') ?>" name="q"
       <?php if($embed == 'none') echo 'autofocus'; ?>>
       <input id="search-f" type="button" value="<?= _m('search') ?>">
-      <label id="search-new"><a href='/<?= $head_options['language']?>/keyboards<?=$session_query_q?>'><?= _m('new_search')?></a></label>
+      <label id="search-new"><a href='<?= $keyboardsPage . $session_query_q?>'><?= _m('new_search')?></a></label>
       <input id="search-obsolete" type="hidden" name="obsolete" value="0">
       <input id="search-page" type="hidden" name="page" value="1">
     </form>
diff --git a/cdn/dev/keyboard-search/search.mjs b/cdn/dev/keyboard-search/search.mjs
index b260d247..760b06a2 100644
--- a/cdn/dev/keyboard-search/search.mjs
+++ b/cdn/dev/keyboard-search/search.mjs
@@ -27,7 +27,7 @@ var embed_query_q = embed_query == '' ? '' : '?'+embed_query;
 var embed_query_x = embed_query == '' ? '' : '&'+embed_query;
 
 // TODO: Validate BCP-47 triplet?
-var langMatch = location.pathname.match(/(\/(.+))?\/keyboards(.*)$/);
+var langMatch = location.pathname.match(/(\/(.+))?\/keyboards\/(.*)$/);
 var embed_lang = (langMatch) ? langMatch[2] : 'en';
 
 var dynamic_search_timeout = 0;
@@ -49,9 +49,9 @@ function getCurrentPath(q, page, obsolete) {
   } else if(r && r[1].charAt(0) == 'l') {
     path = '/' + embed_lang + '/keyboards/languages/'+r[3];
   } else if(q == '') {
-    path = '/' + embed_lang + '/keyboards'
+    path = '/' + embed_lang + '/keyboards/'
   } else {
-    path = '/' + embed_lang + '/keyboards?q='+encodeURIComponent(q);
+    path = '/' + embed_lang + '/keyboards/?q='+encodeURIComponent(q);
   }
 
   if(page + obsolete == '') {
diff --git a/resources/keyman-site.conf b/resources/keyman-site.conf
index 9f1c976a..2bcf4b55 100644
--- a/resources/keyman-site.conf
+++ b/resources/keyman-site.conf
@@ -4,9 +4,14 @@
 
 DirectoryIndex index.md index.php index.html
 
-<Directory /var/www/html>                
+<Directory /var/www/html>
 	Options +Includes +FollowSymLinks -MultiViews
 	AllowOverride All
+
+	## enable the LogLevel line below to trace mod_rewrite in the Docker logs.
+	## Note: traceX where X can be anything from 1-8
+	# LogLevel alert rewrite:trace3
+
 </Directory>
 
 php_value include_path "/var/www/html/_includes:."