# keep either login or logout parts depending on user level
global $User;
- $hideclass = empty($User) ? 'login' : 'logout';
+ $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(
- '{ (?<! <!--BLOCK: ) \[\[ ([^] ]+) ([^]]*) \]\] }x',
+ '{ \[\[ ([^] ]+) ([^]]*) \]\] }x',
function ($sub) use ($blocks) {
list ($placeholder, $name, $params) = $sub;
- if (isset($blocks[$name])) {
- $html = $blocks[$name];
+ $html = $blocks[$name] ??
+ placeholder_include($name, explode(' ', $params));
+ if (empty($html) or $html[0] != '<') {
+ $html = "<span>$html</span>";
}
- else {
- $html = placeholder_include($name, explode(' ', $params));
- }
- 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
);
global $User, $Page, $Args;
http_response_code(500);
if (!isset($Article)) {
+ require_once('article.inc.php');
$Article = new ArchiveArticle(NULL);
$Article->title = 'Fout';
}
# user login and control
-$User = NULL;
-include_once 'auth.inc.php';
+include_once 'auth.inc.php'; // sets global $User
$Edit = isset($_GET['edit']);
# setup requested page
if ($PageAccess = $Article->restricted) {
# access restriction
- if (empty($User)) {
+ if (!$User->login) {
http_response_code(303);
$target = urlencode($Article->link);
header("Location: /login?goto=$target");
# prepare page contents
+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
+])));
+
ob_start(); # page body
$Place = [
- 'user' => $User ? $User->login : '',
+ 'user' => $User->login ?: '',
'url' => htmlspecialchars($_SERVER['REQUEST_URI']),
];
+if (!isset($Article->raw) and $User->admin("edit {$Article->link}")) {
+ # open template as initial contents
+ $Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
+ $Article->meta['article:published_time'] = date('Y-m-d h:i:s O');
+ $Article->meta['article:author'] = '/' . $User->dir;
+}
+
if (isset($Article->raw)) {
- if ($User and $User->admin("edit $Page$Args")) {
+ 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",
+ '<meta property="%s" content="%s">'."\n",
$metaprop, $val
) . $Article->raw;
}
}
$Article->raw = '<div class="static">'."\n\n".$Article->raw."</div>\n\n";
}
-elseif (!$Article->raw and $User and $User->admin("edit {$Article->link}")) {
- $Article->raw(file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
-}
# output dynamic and/or static html