exit;
}
+function placeholder_include($name, $params = [])
+{
+ $path = stream_resolve_include_path("widget/$name.php");
+ if (!file_exists($path)) {
+ return '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
+ }
+
+ ob_start();
+ $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
+ $Args = '';
+ $Place = $GLOBALS['Place'];
+ foreach ($params as $param) {
+ if ($set = strpos($param, '=')) {
+ $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
+ }
+ elseif (!empty($param)) {
+ $Args .= '/'.$param;
+ }
+ }
+ try {
+ include "widget/$name.php";
+ return ob_get_clean();
+ }
+ catch (Exception $e) {
+ return sprintf('<strong class="warn">%s</strong>',
+ "fout in <em>$name</em>: {$e->getMessage()}"
+ );
+ }
+}
+
function getoutput($blocks = [])
{
$doc = ob_get_clean();
}
}
+ # keep either login or logout parts depending on user level
+ global $User;
+ $hideclass = $User && property_exists($User, 'login') && $User->login ? 'logout' : 'login';
+ $doc = preg_replace('{\s*<([a-z]+) class="'.$hideclass.'">.*?</\1>}s', '', $doc);
+
return preg_replace_callback(
- '< \[\[ ([^] ]+) ([^]]*) \]\] >x',
+ '{ \[\[ ([^] ]+) ([^]]*) \]\] }x',
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
- if (isset($blocks[$name])) {
- $html = $blocks[$name];
- }
- elseif (file_exists("$name.php")) {
- ob_start();
- $Page = $GLOBALS['Page'] . $GLOBALS['Args'];
- $Args = '';
- $Place = $GLOBALS['Place'];
- foreach (explode(' ', $params) as $param) {
- if ($set = strpos($param, '=')) {
- $Place[ substr($param, 0, $set) ] = substr($param, $set + 1);
- }
- elseif (!empty($param)) {
- $Args .= '/'.$param;
- }
- }
- try {
- include "$name.php";
- $html = ob_get_clean();
- }
- catch (Exception $e) {
- $html = sprintf('<strong class="warn">%s</strong>',
- "fout in <em>$name</em>: {$e->getMessage()}"
- );
- }
+ $html = $blocks[$name] ??
+ placeholder_include($name, explode(' ', $params));
+ if (empty($html) or $html[0] != '<') {
+ $html = "<span>$html</span>";
}
- else {
- $html = '<strong class="warn"><em>'.$name.'</em> ontbreekt</strong>';
- }
- return sprintf('<!--BLOCK:%s-->%s<!--/-->',
- is_numeric($name) ? '' : $placeholder, # edit replacement
- preg_replace('{<!--[^-]*-->}', '', $html) # contents
- );
+ $attr = sprintf(' data-dyn="%s"', is_numeric($name) ? '' : $name.$params);
+ # contents with identifier in first tag
+ return preg_replace( '/(?=>)/', $attr, $html, 1);
},
$doc
);
function fail($error)
{
+ global $User, $Page, $Args;
http_response_code(500);
+ if (!isset($Article)) {
+ require_once('article.inc.php');
+ $Article = new ArchiveArticle(NULL);
+ $Article->title = 'Fout';
+ }
include_once 'page.inc.php';
ob_start();
- require_once '500.html';
- print getoutput(['debug' => $error]);
+ require '500.inc.html';
+ print getoutput(['debug' => htmlspecialchars($error)]);
}
set_exception_handler('fail');
# user login and control
-include_once 'auth.inc.php';
+include_once 'auth.inc.php'; // sets global $User
$Edit = isset($_GET['edit']);
-# distinguish subpage Args from topmost Page script
+# setup requested page
$Args = '';
$Page = preg_replace('/\?.*/', '', @$_SERVER['PATH_INFO'] ?: $_SERVER['REQUEST_URI']);
$Page = urldecode(trim($Page, '/')) ?: 'index';
-while (TRUE) {
- if (file_exists("$Page/.private")) {
- # access restriction
- if (empty($User)) {
- http_response_code(303);
- $target = urlencode($_SERVER['REQUEST_URI']);
- header("Location: /login?goto=$target");
- exit;
- }
- $PageAccess = $Page;
- }
-
- if (file_exists("$Page/index.php")) {
- break;
- }
- $up = strrpos($Page, '/');
- $Args = substr($Page, $up) . $Args;
- $Page = substr($Page, 0, $up);
- if ($up === FALSE) {
- break;
- }
-}
-
-$staticpage = NULL;
-if (file_exists("$Page$Args.html")) {
- $staticpage = "$Page$Args.html";
+$staticpage = "$Page.html";
+if (file_exists($staticpage)) {
if (is_link($staticpage)) {
- $target = readlink($staticpage);
+ $target = preg_replace('/\.html$/', '', readlink($staticpage));
header("HTTP/1.1 302 Shorthand");
header("Location: $target");
exit;
}
}
-elseif (file_exists("$Page$Args/index.html")) {
- $staticpage = "$Page$Args/index.html";
-}
-elseif (!empty($User['admin'])) {
- $staticpage = (file_exists("$Page/template.html") ? "$Page/template.html" : 'template.html');
+elseif (file_exists("$Page/index.html")) {
+ $staticpage = "$Page/index.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";
+$Page = $Article->handler;
+$Args = $Article->path;
-$found = FALSE;
-if (isset($staticpage)) {
- $found = include "./$staticpage";
+if ($PageAccess = $Article->restricted) {
+ # access restriction
+ if (!$User->login) {
+ http_response_code(303);
+ $target = urlencode($Article->link);
+ header("Location: /login?goto=$target");
+ exit;
+ }
}
-print "</div>\n\n";
-
-# execute dynamic code
+# prepare page contents
-$Place = [];
-
-if ($Page) {
- $found |= require "./$Page/index.php";
-}
+header(sprintf('Content-Security-Policy: %s', implode('; ', [
+ "default-src 'self' 'unsafe-inline' http://cdn.ckeditor.com", # some overrides remain
+ "img-src 'self' data: http://cdn.ckeditor.com", # inline svg (in css)
+ "base-uri 'self'", # only local pages
+ "frame-ancestors 'none'", # prevent malicious embedding
+])));
-$Place += [
- 'user' => empty($User) ? '' : $User['name'],
+ob_start(); # page body
+$Place = [
+ 'user' => $User->login ?: '',
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
-# global html
+if (isset($Article->raw)) {
+ if ($User->admin("edit $Page$Args")) {
+ # restore meta tags in static contents for editing
+ foreach (array_reverse($Article->meta) as $metaprop => $val) {
+ $Article->raw = sprintf(
+ '<meta property="%s" content="%s" />'."\n",
+ $metaprop, $val
+ ) . $Article->raw;
+ }
+ }
+}
+elseif ($User->admin("edit {$Article->link}")) {
+ $Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.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';
git.shiar.nl / minimedit.git / blobdiff