X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/11c30da0ff491c29301ec1a42e7873d556364c74..251616969893b447852aad81a4e68be6853e202e:/page.php

diff --git a/page.php b/page.php
index dd629fd..c2c4282 100644
--- a/page.php
+++ b/page.php
@@ -10,7 +10,7 @@ function abort($body, $status = NULL) {
 
 function placeholder_include($name, $params = [])
 {
-	$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) {
@@ -52,8 +52,13 @@ function getoutput($blocks = [])
 		}
 	}
 
+	# keep either login or logout parts depending on user level
+	global $User;
+	$hideclass = empty($User) ? 'login' : 'logout';
+	$doc = preg_replace('{\s*<(p|li|span) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+
 	return preg_replace_callback(
-		'< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+		'{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
 		function ($sub) use ($blocks) {
 			list ($placeholder, $name, $params) = $sub;
 			if (isset($blocks[$name])) {
@@ -108,6 +113,7 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
+$User = NULL;
 include_once 'auth.inc.php';
 $Edit = isset($_GET['edit']);
 
@@ -153,19 +159,23 @@ if (file_exists("$Page$Args.html")) {
 elseif (file_exists("$Page$Args/index.html")) {
 	$staticpage = "$Page$Args/index.html";
 }
-elseif (!empty($User['admin'])) {
+elseif ($User and $User->admin('edit')) {
 	$staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
 }
 
 # load static 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";
+if (isset($Article->raw)) {
+	print $Article->raw;
+	$found = 1;
 }
 
 print "</div>\n\n";
@@ -179,7 +189,7 @@ if ($Page) {
 }
 
 $Place += [
-	'user'  => empty($User) ? '' : $User['name'],
+	'user'  => $User ? $User->login : '',
 	'url'   => htmlspecialchars($_SERVER['REQUEST_URI']),
 ];