X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/234326791b1e8177eb475bffc5956d7086cfac4e..2b63cbb67dfa8b65019433108edb62003a39d447:/page.php

diff --git a/page.php b/page.php
index fb39f51..1488f1c 100644
--- 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,45 +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
+# prepare page contents
 
 require_once('article.inc.php');
 $Article = new ArchiveArticle($staticpage);
 
 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
-
-$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)) {
+	$Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
+}
+
+# output dynamic and/or static html
 
-if (!$found) {
-	# no resulting output
-	http_response_code(404);
-	@require '404.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';