X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/5b94cc8fb8d15c44eb5223f262d091b0fe286944..dfe79667de45f0dfee4a57f4988ef7e2cb352d41:/page.php?ds=inline
diff --git a/page.php b/page.php
index f5e9749..932e729 100644
--- a/page.php
+++ b/page.php
@@ -84,6 +84,10 @@ 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.inc.html';
@@ -163,42 +167,42 @@ 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
+# prepare page contents
require_once('article.inc.php');
$Article = new ArchiveArticle($staticpage);
ob_start(); # page body
-ob_start(); # inner html
-print '
'."\n\n";
-
-$found = FALSE;
-if (isset($Article->raw)) {
- print $Article->raw;
- $found = 1;
-}
-
-print "
\n\n";
-
-# execute dynamic code
-
-$Place = [];
-
-if ($Page) {
- $found |= require "./$Page/index.php";
-}
-
-$Place += [
+$Place = [
'user' => $User ? $User->login : '',
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
-# global html
+if (isset($Article->raw)) {
+ if ($User and $User->admin("edit $Page$Args")) {
+ # restore meta tags in static contents for editing
+ foreach (array_reverse($Article->meta) as $metaprop => $val) {
+ $Article->raw = sprintf(
+ ''."\n",
+ $metaprop, $val
+ ) . $Article->raw;
+ }
+ }
+ $Article->raw = ''."\n\n".$Article->raw."
\n\n";
+}
+
+# output dynamic and/or static html
-if (!$found) {
- # no resulting output
- http_response_code(404);
- @require '404.inc.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';