From: Mischa POSLAWSKY <perl@shiar.org>
Date: Mon, 10 Jul 2017 01:49:44 +0000 (+0200)
Subject: 404: convert error pages to php code
X-Git-Tag: v1.3~12
X-Git-Url: http://git.shiar.net/minimedit.git/commitdiff_plain/607a4d0feac9b4c3a846901371c78b5cd5975300

404: convert error pages to php code

Only remaining usage of SSI aside from head/foot inclusion.
---

diff --git a/404.html b/404.html
deleted file mode 100644
index b88d082..0000000
--- a/404.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--#include virtual="/head.inc.html" -->
-
-<h2>Niet gevonden</h2>
-
-<p>
-De gevraagde pagina <em><!--#echo var="REQUEST_URI" --></em> bestaat niet.
-</p>
-
-<!--#include virtual="/foot.inc.html" -->
diff --git a/404.php b/404.php
new file mode 100755
index 0000000..ba3e820
--- /dev/null
+++ b/404.php
@@ -0,0 +1,9 @@
+<?php include 'head.inc.html'; ?>
+
+<h2>Niet gevonden</h2>
+
+<p>
+De gevraagde pagina <em><?php echo htmlspecialchars($_SERVER['REQUEST_URI']); ?></em> bestaat niet.
+</p>
+
+<?php include 'foot.inc.php'; ?>
diff --git a/foot.inc.html b/foot.inc.html
index f9ecbbb..41feac0 100644
--- a/foot.inc.html
+++ b/foot.inc.html
@@ -3,7 +3,7 @@
 <!--#if expr="-A /edit.php" -->
 <p class="footer">Beheer toegestaan voor <!--#echo var="REMOTE_ADDR" -->:
 <!--#if expr="$QUERY_STRING = edit || $REQUEST_URI = /[?]edit$/" -->
-<!--#if expr="$DOCUMENT_NAME = 404.html" -->
+<!--#if expr="$DOCUMENT_NAME = 404.php" -->
 <script>
 var pagebody = document.getElementsByClassName('article')[0];
 pagebody.innerHTML = '<h2>Nieuwe pagina</h2><p>&nbsp;</p>';
@@ -12,7 +12,7 @@ pagebody.innerHTML = '<h2>Nieuwe pagina</h2><p>&nbsp;</p>';
 <script src="/ckeditor/ckeditor.js"></script>
 <script src="/edit.js"></script>
 <a href="?">lezen</a>
-<!--#elif expr="$DOCUMENT_NAME = 404.html" -->
+<!--#elif expr="$DOCUMENT_NAME = 404.php" -->
 <a href="?edit">aanmaken</a>
 <!--#else -->
 <a href="?edit">aanpassen</a>
diff --git a/foot.inc.php b/foot.inc.php
index 30426ea..7723e30 100644
--- a/foot.inc.php
+++ b/foot.inc.php
@@ -1,7 +1,7 @@
 </div>
 <hr class="footer" />
 <?php
-if (($notfound = $_SERVER['SCRIPT_NAME'] == '/404.html')) {
+if (($notfound = $_SERVER['SCRIPT_NAME'] == '/404.php')) {
 	echo <<<'EOT'
 <script>
 var pagebody = document.getElementsByClassName('article')[0];