nieuws: create new articles relative to page root

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index c6eee87fbacef892ca0b21df79a97fd203de0b1c..070742643481a29ad0a818a6173841e690b7fdfd 100644 (file)
--- a/page.php
+++ b/page.php
@@ -23,10 +23,38 @@ function getoutput($blocks = [])
        }
 
        return preg_replace_callback(
-               '< \[\[ ([^]]*) \]\] >x',
+               '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
                function ($sub) use ($blocks) {
-                       list ($placeholder, $name) = $sub;
-                       $html = $blocks[$name];
+                       list ($placeholder, $name, $params) = $sub;
+                       if (isset($blocks[$name])) {
+                               $html = $blocks[$name];
+                       }
+                       elseif (file_exists("$name.php")) {
+                               ob_start();
+                               $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+                               $Args = '';
+                               $Place = $GLOBALS['Place'];
+                               foreach (explode(' ', $params) as $param) {
+                                       if ($set = strpos($param, '=')) {
+                                               $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
+                                       }
+                                       elseif (!empty($param)) {
+                                               $Args .= '/'.$param;
+                                       }
+                               }
+                               try {
+                                       include "$name.php";
+                                       $html = ob_get_clean();
+                               }
+                               catch (Exception $e) {
+                                       $html = sprintf('<strong class="warn">%s</strong>',
+                                               "fout in <em>$name</em>: {$e->getMessage()}"
+                                       );
+                               }
+                       }
+                       else {
+                               $html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+                       }
                        return sprintf('<!--BLOCK:%s-->%s<!--/-->',
                                is_numeric($name) ? '' : $placeholder, # edit replacement
                                preg_replace('{<!--[^-]*-->}', '', $html) # contents
@@ -38,14 +66,15 @@ function getoutput($blocks = [])
 
 # custom error handling
 
-define('DOCROOT', getcwd().'/');
+define('DOCROOT', getcwd());
+set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 function fail($error)
 {
        http_response_code(500);
        include_once 'page.inc.php';
        ob_start();
-       require_once DOCROOT.'500.html';
+       require_once '500.html';
        print getoutput(['debug' => $error]);
 }
 
@@ -92,7 +121,7 @@ while (TRUE) {
                $PageAccess = $Page;
        }
 
-       if (file_exists("$Page.php")) {
+       if (file_exists("$Page/index.php")) {
                break;
        }
 
@@ -104,6 +133,23 @@ while (TRUE) {
        }
 }
 
+$staticpage = NULL;
+if (file_exists("$Page$Args.html")) {
+       $staticpage = "$Page$Args.html";
+       if (is_link($staticpage)) {
+               $target = readlink($staticpage);
+               header("HTTP/1.1 302 Shorthand");
+               header("Location: $target");
+               exit;
+       }
+}
+elseif (file_exists("$Page$Args/index.html")) {
+       $staticpage = "$Page$Args/index.html";
+}
+elseif (!empty($User['admin'])) {
+       $staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
+}
+
 # load static contents
 
 ob_start(); # page body
@@ -111,33 +157,32 @@ ob_start(); # inner html
 print '<div class="static">'."\n\n";
 
 $found = FALSE;
-if (file_exists("$Page$Args.html")) {
-       $found = include "./$Page$Args.html";
-}
-elseif (file_exists("$Page$Args/index.html")) {
-       $found = include "./$Page$Args/index.html";
-}
-elseif (!empty($User['admin'])) {
-       $found = include (file_exists("$Page/template.html") ? "$Page/template.html" : './template.html');
+if (isset($staticpage)) {
+       $found = include "./$staticpage";
 }
 
 print "</div>\n\n";
 
 # execute dynamic code
 
+$Place = [];
+
 if ($Page) {
-       $found |= require "./$Page.php";
+       $found |= require "./$Page/index.php";
 }
 
-# global html
+$Place += [
+       'user'  => empty($User) ? '' : $User['name'],
+       'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
+];
 
-include_once 'page.inc.php';
+# global html
 
 if (!$found) {
        # no resulting output
        http_response_code(404);
-       ob_start();
-       @require "./404.html";
-       print getoutput([ 'url' => htmlspecialchars($_SERVER['REQUEST_URI']) ]);
+       @require '404.html';
 }
 
+include_once 'page.inc.php';
+