edit/page: omit link target options except for _blank

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 554735c69b53f9f0db275d5c6ea2fe6df80a4198..070742643481a29ad0a818a6173841e690b7fdfd 100644 (file)
--- a/page.php
+++ b/page.php
@@ -31,18 +31,26 @@ function getoutput($blocks = [])
                        }
                        elseif (file_exists("$name.php")) {
                                ob_start();
-                               $Page = $GLOBALS['Page'];
-                               $Args = $GLOBALS['Args'];
+                               $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+                               $Args = '';
+                               $Place = $GLOBALS['Place'];
                                foreach (explode(' ', $params) as $param) {
                                        if ($set = strpos($param, '=')) {
-                                               $_GET[ substr($param, 0, $set) ] = substr($param, $set + 1);
+                                               $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
                                        }
                                        elseif (!empty($param)) {
                                                $Args .= '/'.$param;
                                        }
                                }
-                               include "$name.php";
-                               $html = ob_get_clean();
+                               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>';
@@ -58,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]);
 }
 
@@ -124,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
@@ -131,14 +157,8 @@ 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";
@@ -152,7 +172,7 @@ if ($Page) {
 }
 
 $Place += [
-       'user'  => $User ? $User['name'] : '',
+       'user'  => empty($User) ? '' : $User['name'],
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
@@ -161,7 +181,7 @@ $Place += [
 if (!$found) {
        # no resulting output
        http_response_code(404);
-       @require "./404.html";
+       @require '404.html';
 }
 
 include_once 'page.inc.php';