page: route requests through global php handler

Move contents of all *.php pages to source *.html, to be included by
page.php depending on requested path.  Dynamic contents can optionally be
added by corresponding *.php includes.

diff --git a/.htaccess b/.htaccess
new file mode 100644 (file)
index 0000000..ef206d7
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,6 @@
+RewriteEngine  on
+RewriteBase    /
+
+# common php handler
+RewriteCond    %{REQUEST_FILENAME} !-f
+RewriteRule '' page.php%{REQUEST_FILENAME} [L]

diff --git a/edit.js b/edit.js
index dee103855135dca7f4ddd251a02cb1f9355eb820..6f9211eea2f18f8863436634ddf18d35cb172516 100644 (file)
--- a/edit.js
+++ b/edit.js
@@ -2,10 +2,10 @@ CKEDITOR.plugins.add('inlinesave', {
        init: function(editor) {
                editor.addCommand( 'inlinesave', {
                        exec: function (editor) {
-                               var pagename = window.location.pathname.replace(/\.php$/, '').replace(/\/$/, '/index');
+                               var pagename = window.location.pathname.replace(/\/$/, '/index');
                                var data = 'body='+encodeURIComponent(editor.getData());
                                ajaxpost = new XMLHttpRequest();
-                               ajaxpost.open('POST', '/edit.php'+pagename, true);
+                               ajaxpost.open('POST', '/edit'+pagename, true);
                                ajaxpost.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
                                ajaxpost.onreadystatechange = function () {
                                        if (ajaxpost.readyState != 4)
@@ -46,7 +46,7 @@ CKEDITOR.on('instanceCreated', function (event) {
                config.format_tags = 'h2;h3;h4;p';
                config.allowedContent = true;
                config.entities = false; // keep unicode
-               config.filebrowserImageUploadUrl = '/edit.php?type=img';
+               config.filebrowserImageUploadUrl = '/edit?type=img';
                config.forcePasteAsPlainText = true;
                config.contentsCss = '/excelsior.css';
                config.toolbar = [

diff --git a/edit.php b/edit.php
index 3774bfc51407bf441ed055b8ffcbd7342a129887..fe80528a7d1c83faca00ef8e751cf5e271baae72 100755 (executable)
--- a/edit.php
+++ b/edit.php
@@ -14,7 +14,7 @@ if (!$_POST)
 if (!isset($_SERVER['PATH_INFO']) or strlen($_SERVER['PATH_INFO']) <= 1)
        abort('409 input error', "geen bestand aangeleverd");
 
-$filename = preg_replace('/(?:\.php)?$/', '.php', ltrim($_SERVER['PATH_INFO'], '/'), 1);
+$filename = ltrim($Args, '/').'.html';
 if (file_exists($filename) and !is_writable($filename))
        abort('403 input error', "ongeldige bestandsnaam: $filename");
 if (is_executable($filename))
@@ -33,11 +33,7 @@ if (!strlen($upload)) {
        exit;
 }
 
-$rootpath = str_repeat('../', substr_count($filename, '/'));
-$prepend = "<?php include '${rootpath}head.inc.php'; ?>\n\n";
-$append  = "\n";
-
-if (!file_put_contents($filename, $prepend . $upload . $append))
+if (!file_put_contents($filename, $upload))
        abort('500 save error', "fout bij schrijven van $filename");
 
 print "Bestand opgeslagen";

diff --git a/foot.inc.php b/foot.inc.php
index 96b05ea2159f32e6101d48529d337b75615be778..e3e36b6f183b07e9f3c5c7bbb752205af56d7d85 100755 (executable)
--- a/foot.inc.php
+++ b/foot.inc.php
@@ -2,21 +2,16 @@
 <?php
 define('N', "\n");
 
-global $User, $Admin;
-
-$curfile = ltrim($_SERVER['SCRIPT_NAME'], '/');
-if (is_executable(__DIR__ . '/' . $curfile)) {
-       // dynamic code is +x
-       $Admin = FALSE;
-}
+global $Page, $User, $Admin;
 
 if ($Admin) {
        $edit = preg_match('/[?]edit$/', $_SERVER['REQUEST_URI']);
+       $notfound = $Page == '404';
 
        if ($edit) {
                echo '<script src="/ckeditor/ckeditor.js"></script>'.N;
                echo '<script src="/edit.js"></script>'.N;
-               if (($notfound = $_SERVER['SCRIPT_NAME'] == '/404.php')) {
+               if ($notfound) {
                        echo <<<'EOT'
 <script>
 var pagebody = document.getElementsByClassName('article')[0];

diff --git a/head.inc.php b/head.inc.php
index f8435ffb8852c6fb1ec83a61d867884247b9492d..2e57f81f7a78ca0c353c6f9102014e717bb49a7f 100644 (file)
--- a/head.inc.php
+++ b/head.inc.php
@@ -12,3 +12,7 @@ register_shutdown_function(function () {
        include 'foot.inc.php';
        print "</body></html>\n";
 });
+
+include "$Page.html";
+if (file_exists("$Page.php")) include_once("$Page.php");
+

diff --git a/page.php b/page.php
new file mode 100644 (file)
index 0000000..5d79cf6
--- /dev/null
+++ b/page.php
@@ -0,0 +1,32 @@
+<?php
+error_reporting(E_ALL);
+ini_set('display_errors', TRUE);
+
+$Args = '';
+$Page = preg_replace('/\?.*/', '', $_SERVER['REQUEST_URI']);
+$Page = urldecode(trim($Page, '/')) ?: 'index';
+while (TRUE) {
+       if (file_exists("$Page/index.html")) {
+               $Page .= '/index';
+               break;
+       }
+       if (file_exists("$Page.html")) {
+               break;
+       }
+       if (file_exists("$Page.php")) {
+               # unformatted script override
+               require "$Page.php";
+               break;
+       }
+
+       $up = strrpos($Page, '/');
+       if ($up === FALSE) {
+               http_response_code(404);
+               $Page = '404';
+               break;
+       }
+       $Args = substr($Page, $up) . $Args;
+       $Page = substr($Page, 0, $up);
+}
+
+include 'head.inc.php';