X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/1abb286e88defee799e43cdd296914f74f722bde..6212e202d229f2301931f72cea4370d4e931ed1d:/page.php

diff --git a/page.php b/page.php
index a05e158..10e90fa 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) {
@@ -86,7 +86,7 @@ function fail($error)
 	http_response_code(500);
 	include_once 'page.inc.php';
 	ob_start();
-	require_once '500.html';
+	require_once '500.inc.html';
 	print getoutput(['debug' => $error]);
 }
 
@@ -159,8 +159,8 @@ 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')) {
+	$staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
 }
 
 # load static contents
@@ -173,7 +173,7 @@ ob_start(); # inner html
 print '<div class="static">'."\n\n";
 
 $found = FALSE;
-if ($Article->file) {
+if (isset($Article->raw)) {
 	print $Article->raw;
 	$found = 1;
 }
@@ -198,7 +198,7 @@ $Place += [
 if (!$found) {
 	# no resulting output
 	http_response_code(404);
-	@require '404.html';
+	@require '404.inc.html';
 }
 
 include_once 'page.inc.php';