From 30bf0fcde3f7e44f1ec7bcfc8253dfce8f81e8e6 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Fri, 15 Oct 2021 12:37:55 +0200
Subject: [PATCH] word: move subpages and includes to word/ directory

---
 .htaccess                     |  4 +++-
 word.plp                      | 23 ++++++-----------------
 writer.plp => word/edit.plp   |  9 +++++----
 editor.css => word/editor.css |  0
 writer.js => word/editor.js   |  0
 wordquiz.js => word/quiz.js   |  0
 word/quiz.plp                 | 12 ++++++++++++
 7 files changed, 26 insertions(+), 22 deletions(-)
 rename writer.plp => word/edit.plp (97%)
 rename editor.css => word/editor.css (100%)
 rename writer.js => word/editor.js (100%)
 rename wordquiz.js => word/quiz.js (100%)
 create mode 100644 word/quiz.plp

diff --git a/.htaccess b/.htaccess
index 0c5b23d..b23841f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,5 +1,6 @@
 Options        -MultiViews
 DirectoryIndex index.plp
+DirectorySlash Off
 
 RewriteEngine  on
 RewriteBase    /
@@ -16,7 +17,8 @@ RewriteRule ^cc$                     /countries [R=301]
 RewriteRule    ^(digraphs)\.ex(/.*)?$ $1.vim$2
 
 # add .plp if a file exists with .plp appended (topdir only)
-RewriteCond    %{REQUEST_FILENAME}.plp  -f
+RewriteCond    %{REQUEST_FILENAME}     !-f
+RewriteCond    %{DOCUMENT_ROOT}/$1.plp  -f
 RewriteRule    ^/*([^/]+)(.*)           $1.plp$2
 
 # allow browsers to cache for upto a month
diff --git a/word.plp b/word.plp
index b5a07bf..9fa1aaa 100644
--- a/word.plp
+++ b/word.plp
@@ -1,22 +1,11 @@
 <(common.inc.plp)><:
 
-if ($Request and $Request =~ s{^edit/?}{}) {
-	Include 'writer.plp';
-	exit;
-}
-
-if ($Request and $Request =~ s{^quiz/?}{}) {
-	Html({
-		raw => <<'EOT',
-<script src="/wordquiz.js"></script>
-<style>
-.wrong {background: red}
-.good {background: green}
-</style>
-EOT
-	});
-	say '<h1>quiz</h1><p id="quiz">test</p>';
-	exit;
+if ($Request and $Request =~ m{\A([^/]+)}) {
+	my $page = "word/$1.plp";
+	if (-e $page) {
+		Include $page;
+		exit;
+	}
 }
 
 my $lang = $get{lang} || 'en';
diff --git a/writer.plp b/word/edit.plp
similarity index 97%
rename from writer.plp
rename to word/edit.plp
index cd2e2bf..d8de602 100644
--- a/writer.plp
+++ b/word/edit.plp
@@ -1,12 +1,13 @@
-<(common.inc.plp)><:
+<(../common.inc.plp)><:
 
+s{\Aedit(/|\z)}{} for $Request // ();
 Html({
 	title => 'words cheat sheet admin',
 	version => '1.0',
 	nocache => 1,
 	raw => <<'EOT',
-<link rel="stylesheet" type="text/css" media="all" href="/editor.css" />
-<script src="/writer.js"></script>
+<link rel="stylesheet" type="text/css" media="all" href="/word/editor.css" />
+<script src="/word/editor.js"></script>
 EOT
 });
 
@@ -20,7 +21,7 @@ my $db = eval {
 } or Abort('Database error', 501, $@);
 
 my $user = eval {
-	my $rootpath = ($ENV{REQUEST_URI} // '/writer') =~ s{(?<!^)/.+}{}r;
+	my $rootpath = '/word/edit';
 	if (defined $post{username}) {
 		$cookie{login} = EncodeURI(join ':', @post{qw( username pass )});
 	}
diff --git a/editor.css b/word/editor.css
similarity index 100%
rename from editor.css
rename to word/editor.css
diff --git a/writer.js b/word/editor.js
similarity index 100%
rename from writer.js
rename to word/editor.js
diff --git a/wordquiz.js b/word/quiz.js
similarity index 100%
rename from wordquiz.js
rename to word/quiz.js
diff --git a/word/quiz.plp b/word/quiz.plp
new file mode 100644
index 0000000..c40a7cd
--- /dev/null
+++ b/word/quiz.plp
@@ -0,0 +1,12 @@
+<(../common.inc.plp)><:
+
+Html({
+	raw => <<'EOT',
+<script src="/word/quiz.js"></script>
+<style>
+.wrong {background: red}
+.good {background: green}
+</style>
+EOT
+});
+say '<h1>quiz</h1><p id="quiz">test</p>';
-- 
2.30.0