# 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(
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)) {
- 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(
}
}
}
-elseif ($User and $User->admin("edit {$Article->link}")) {
+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)) {