page: silence object warnings on missing pages

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index 894efc003cc2671014e5115b2012870a4c55da2e..1488f1c5904f7a637208305037bfd73bb02e7861 100644 (file)
--- a/page.php
+++ b/page.php
@@ -10,7 +10,7 @@ function abort($body, $status = NULL) {
 
 function placeholder_include($name, $params = [])
 {
-       $path = stream_resolve_include_path("$name.php");
+       $path = stream_resolve_include_path("widget/$name.php");
        if (!file_exists($path)) {
                return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
        }
@@ -28,7 +28,7 @@ function placeholder_include($name, $params = [])
                }
        }
        try {
-               include "$name.php";
+               include "widget/$name.php";
                return ob_get_clean();
        }
        catch (Exception $e) {
@@ -84,9 +84,13 @@ set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 function fail($error)
 {
        http_response_code(500);
+       if (!isset($Article)) {
+               $Article = new ArchiveArticle(NULL);
+               $Article->title = 'Fout';
+       }
        include_once 'page.inc.php';
        ob_start();
-       require_once '500.html';
+       require_once '500.inc.html';
        print getoutput(['debug' => $error]);
 }
 
@@ -159,42 +163,37 @@ if (file_exists("$Page$Args.html")) {
 elseif (file_exists("$Page$Args/index.html")) {
        $staticpage = "$Page$Args/index.html";
 }
-elseif ($User and $User->admin) {
-       $staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
+elseif ($User and $User->admin("edit $Page$Args")) {
+       $staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
 }
 
-# load static contents
-
-ob_start(); # page body
-ob_start(); # inner html
-print '<div class="static">'."\n\n";
-
-$found = FALSE;
-if (isset($staticpage)) {
-       $found = include "./$staticpage";
-}
-
-print "</div>\n\n";
-
-# execute dynamic code
+# prepare page contents
 
-$Place = [];
+require_once('article.inc.php');
+$Article = new ArchiveArticle($staticpage);
 
-if ($Page) {
-       $found |= require "./$Page/index.php";
-}
-
-$Place += [
+ob_start(); # page body
+$Place = [
        'user'  => $User ? $User->login : '',
        'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];
 
-# global html
+if (isset($Article->raw)) {
+       $Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
+}
 
-if (!$found) {
-       # no resulting output
-       http_response_code(404);
-       @require '404.html';
+# output dynamic and/or static html
+
+if (!$Page or require("./$Page/index.php")) {
+       # static contents
+       if (isset($Article->raw)) {
+               print $Article->raw;
+       }
+       else {
+               # no resulting output
+               http_response_code(404);
+               @require '404.inc.html';
+       }
 }
 
 include_once 'page.inc.php';