page: record creation time in template meta tag

[minimedit.git] / page.php

diff --git a/page.php b/page.php
index d2532a5733eb64e9e6b83396bb4095e0606b634f..d4404fd0e22a1398783c74c332fa47435f641e3f 100644 (file)
--- a/page.php
+++ b/page.php
@@ -54,23 +54,21 @@ function getoutput($blocks = [])
 
        # 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
        );
@@ -83,15 +81,17 @@ set_include_path(implode(PATH_SEPARATOR, [ DOCROOT, __DIR__ ]));
 
 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 '500.inc.html';
-       print getoutput(['debug' => $error]);
+       print getoutput(['debug' => htmlspecialchars($error)]);
 }
 
 set_exception_handler('fail');
@@ -117,42 +117,17 @@ error_reporting(error_reporting() & ~E_FATAL);
 
 # user login and control
 
-$User = NULL;
-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 = preg_replace('/\.html$/', '', readlink($staticpage));
                header("HTTP/1.1 302 Shorthand");
@@ -160,30 +135,54 @@ if (file_exists("$Page$Args.html")) {
                exit;
        }
 }
-elseif (file_exists("$Page$Args/index.html")) {
-       $staticpage = "$Page$Args/index.html";
+elseif (file_exists("$Page/index.html")) {
+       $staticpage = "$Page/index.html";
 }
-elseif ($User and $User->admin("edit $Page$Args")) {
-       $staticpage = (file_exists("$Page/template.inc.html") ? "$Page/template.inc.html" : 'template.inc.html');
+
+require_once('article.inc.php');
+$Article = new ArchiveArticle($staticpage);
+
+$Page = $Article->handler;
+$Args = $Article->path;
+
+if ($PageAccess = $Article->restricted) {
+       # access restriction
+       if (!$User->login) {
+               http_response_code(303);
+               $target = urlencode($Article->link);
+               header("Location: /login?goto=$target");
+               exit;
+       }
 }
 
 # prepare page contents
 
-require_once('article.inc.php');
-$Article = new ArchiveArticle($staticpage);
+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;
                }